Docker stuff

Author: ClusterM

.github/workflows/docker.yml

@@ -0,0 +1,52 @@
+name: Build Docker Images
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: wg-obfuscator
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      matrix:
+        platform: [amd64, arm64, arm/v7, arm/v6, 386, ppc64le, s390x]
+      fail-fast: false
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Prepare tar filename
+        id: prep
+        run: |
+          SAFE_NAME="${{ env.IMAGE_NAME }}-${{ matrix.platform }}"
+          SAFE_NAME="${SAFE_NAME//\//-}"
+          echo "tar_name=$SAFE_NAME.tar" >> $GITHUB_OUTPUT
+
+      - name: Build per-arch image and export as tar
+        uses: docker/build-push-action@v5
+        with:
+          push: false
+          tags: ${{ env.IMAGE_NAME }}:${{ matrix.platform }}
+          platforms: ${{ matrix.platform }}
+          outputs: type=docker,dest=${{ steps.prep.outputs.tar_name }}
+          context: .
+
+      - name: Upload image tar
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prep.outputs.tar_name }}
+          path: ${{ steps.prep.outputs.tar_name }}

.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+name: Build & Publish Multiarch Docker Image
+
+on:
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: wg-obfuscator
+  PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/386,linux/ppc64le,linux/s390x
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push multiarch image
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: clustermeerkat/${{ env.IMAGE_NAME }}:latest
+          platforms: ${{ env.PLATFORMS }}
+          context: .

Dockerfile

@@ -1,32 +1,16 @@
 # Stage 1: Build
-FROM ubuntu:latest AS builder
+FROM alpine:latest AS build
+WORKDIR /src
 
-# Install necessary build tools and dependencies
-RUN apt-get update && \
-    apt-get install -y build-essential sudo git systemctl
+RUN apk add --no-cache build-base argp-standalone
 
-# Add the current project to the container
-COPY . /usr/src/app
+COPY wg-obfuscator.c wg-obfuscator.h Makefile ./
 
-# Set the working directory
-WORKDIR /usr/src/app
-
-# Build the project using make
-RUN make
-
-# Install the built project into the /install directory
-RUN mkdir /install && \
-    make install
+RUN make clean && make CC="gcc -static" LDFLAGS="-largp"
 
 # Stage 2: Runtime
-FROM ubuntu:latest
-
-# Copy installed files from builder stage
-COPY --from=builder /usr/bin/wg-obfuscator /usr/bin/wg-obfuscator
-COPY --from=builder /etc/wg-obfuscator.conf /etc/wg-obfuscator.conf
-
-# Ensure necessary permissions
-RUN chmod +x /usr/bin/wg-obfuscator
-
-# Command to start the service
-CMD ["wg-obfuscator", "-c", "/etc/wg-obfuscator.conf"]
+FROM alpine:latest
+WORKDIR /app
+COPY --from=build /src/wg-obfuscator ./wg-obfuscator
+COPY wg-obfuscator.conf /etc/wg-obfuscator/wg-obfuscator.conf
+ENTRYPOINT ["./wg-obfuscator", "-c", "/etc/wg-obfuscator/wg-obfuscator.conf"]

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
-      - ./.wg-obfuscator.conf:/etc/wg-obfuscator.conf
+      - ./.wg-obfuscator.conf:/etc/wg-obfuscator/wg-obfuscator.conf
     ports:
       - "13255:13255/udp"
       - "13255:13255/tcp"