Merge pull request #7 from ncode/juliano/development

development environment improvements and chain update

Author: ncode

README.md

@@ -18,6 +18,37 @@ The CNI Outbound Plugin is a Container Network Interface (CNI) plugin built to m
 - Supports ADD, DEL, and CHECK operations as per CNI specification
 - Integrates with existing CNI plugins as a chained plugin
 
+## Development Setup
+
+The project includes a development environment using Docker Compose. To use the development setup:
+
+1. Navigate to the `configs/development` directory:
+   ```
+   cd configs/development
+   ```
+
+2. Build the project, create the Docker image, and start the development environment:
+   ```
+   make all
+   ```
+
+   This command will:
+   - Build the plugin for Linux ARM64
+   - Create a Docker image with Nomad and the CNI plugin
+   - Start the Docker Compose environment
+
+3. To stop and remove the development environment:
+   ```
+   make down
+   ```
+
+4. To rebuild and restart the environment after making changes:
+   ```
+   make build docker-build down up
+   ```
+
+The development environment includes a Nomad server with the CNI Outbound Plugin pre-installed. You can access the Nomad UI at `http://localhost:4646`.
+
 ## Installation
 
 To install the CNI Outbound Plugin, follow these steps:
@@ -223,4 +254,4 @@ This project is licensed under Apache-2.0
 - [go-iptables](https://github.com/coreos/go-iptables)
 - [Nomad by HashiCorp](https://www.nomadproject.io/)
 
-For more information on CNI plugins and their use with Nomad, refer to the [Nomad CNI documentation](https://www.nomadproject.io/docs/networking/cni).
+For more information on CNI plugins and their use with Nomad, refer to the [Nomad CNI documentation](https://www.nomadproject.io/docs/networking/cni).

configs/development/Dockerfile

@@ -2,28 +2,31 @@
 FROM oraclelinux:9
 
 # Set environment variables
-ENV NOMAD_VERSION=1.8.2
+ENV NOMAD_VERSION=1.8.3
 ENV CNI_PLUGINS_VERSION=v1.5.1
 ENV ARCH=arm64
 
 # Install necessary packages
 RUN dnf update -y && \
     dnf install -y \
     curl \
-    git \
     unzip \
+    socat \
+    nc \
     tcpdump \
     bind-utils \
     iproute \
     iputils \
     iptables \
+    ebtables \
+    procps-ng \
     ipset \
     ca-certificates && \
     dnf clean all 
 
 # Download and install Nomad for the appropriate architecture
 RUN curl -fsSL https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_${ARCH}.zip -o nomad.zip && \
-    mkdir -p /etc/nomad /var/lib/nomad && \
+    mkdir -p /etc/nomad /var/lib/nomad /var/log/cni && \
     unzip nomad.zip && \
     rm nomad.zip && \
     mv nomad /usr/local/bin/nomad

configs/development/Makefile

@@ -6,10 +6,7 @@ build:
 	GOOS=linux GOARCH=arm64 go build -o outbound -ldflags="-s -w" ../../
 
 docker-build:
-	cp -f ../my-network.conflist .
 	docker build -t ncode/cni-output:dev .
-	rm my-network.conflist
-	rm outbound
 
 up:
 	docker compose up