make nginx

MalteJ · MalteJ · commit ba5e10a3c8d8 · 2025-06-27T15:48:55.000+02:00
diff --git a/.github/workflows/nginx-container.yaml b/.github/workflows/nginx-container.yaml
@@ -77,7 +77,7 @@ jobs:
     - name: Build initramfs
       run: make initramfs
 
-    - name: Build UKI
+    - name: Build UKI with secrets
       run: |
         CMDLINE="console=tty0 console=ttyS0,115200 earlyprintk=ttyS0,115200 consoleblank=0"
         echo $CMDLINE > target/cmdline
@@ -87,29 +87,17 @@ jobs:
         openssl x509 -in keys/secureboot.pem -out keys/feos.crt -outform DER
         make uki
 
-    - name: Create Dockerfile for nginx container
+    - name: Build nginx container
+      run: make nginx
+
+    - name: Tag and push Docker image
       run: |
-        cat > Dockerfile.nginx << 'EOF'
-        FROM nginx:alpine
-        
-        # Copy the UKI file to nginx html directory
-        COPY target/uki.efi /usr/share/nginx/html/feos.uki
-        
-        # Add MIME type for .uki files
-        RUN echo 'application/efi uki;' >> /etc/nginx/mime.types
+        # Tag the locally built image with the registry tags
+        for tag in ${{ steps.meta.outputs.tags }}; do
+          docker tag feos-nginx $tag
+        done
         
-        # Create a simple index page
-        RUN echo '<html><body><h1>FeOS UKI Server</h1><p><a href="/feos.uki">Download FeOS UKI (x86_64)</a></p></body></html>' > /usr/share/nginx/html/index.html
-        
-        EXPOSE 80
-        EOF
-
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        file: ./Dockerfile.nginx
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }} 
+        # Push all tags
+        for tag in ${{ steps.meta.outputs.tags }}; do
+          docker push $tag
+        done 
diff --git a/Makefile b/Makefile
@@ -22,3 +22,22 @@ include hack/hack.mk
 
 cli:
 	 cargo build --bin feos-cli
+
+nginx: uki
+	@echo "Building nginx container with FeOS UKI..."
+	@cat > Dockerfile.nginx << 'EOF'
+FROM nginx:alpine
+
+# Copy the UKI file to nginx html directory
+COPY target/uki.efi /usr/share/nginx/html/feos.uki
+
+# Add MIME type for .uki files
+RUN echo 'application/efi uki;' >> /etc/nginx/mime.types
+
+# Create a simple index page
+RUN echo '<html><body><h1>FeOS UKI Server</h1><p><a href="/feos.uki">Download FeOS UKI (x86_64)</a></p></body></html>' > /usr/share/nginx/html/index.html
+
+EXPOSE 80
+EOF
+	docker build -f Dockerfile.nginx -t feos-nginx .
+	@echo "Built feos-nginx container successfully"
