update workflows.

.github/workflows/dockerhub.yml

@@ -34,10 +34,8 @@ jobs:
 
       - name: Build base
         run: |
-          BUILD_IMAGE=${DOCKER_IMAGE} .docker/build ${DOCKER_TAG}
-          docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
-        env:
-          DOCKER_TAG: base
+          ./build -b ${DOCKER_IMAGE}:base
+          docker push ${DOCKER_IMAGE}:base
 
   build:
     runs-on: ubuntu-latest
@@ -67,7 +65,8 @@ jobs:
 
       - name: Build container
         run: |
-          BUILD_IMAGE=${DOCKER_IMAGE} .docker/build ${DOCKER_TAG}
+          ./build -b ${DOCKER_IMAGE}:base -i ${DOCKER_IMAGE}
+          docker tag ${DOCKER_IMAGE}/${DOCKER_TAG} ${DOCKER_IMAGE}:${DOCKER_TAG}
           docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
 
       - name: Push latest tag

.github/workflows/ghcr-amd.yml

@@ -9,7 +9,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: m1k1o/neko
   TAG_PREFIX: ""
-  BASE_DOCKERFILE: Dockerfile
+  RUNTIME_DOCKERFILE: Dockerfile
   PLATFORMS: linux/amd64
 
 jobs:
@@ -47,12 +47,14 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+      - 
+        name: Generate base Dockerfile
+        run: RUNTIME_DOCKERFILE=${{ env.RUNTIME_DOCKERFILE }} ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
       - 
         name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -117,7 +119,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .docker/${{ env.TAG_NAME }}
+          context: apps/${{ env.TAG_NAME }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ghcr-arm.yml

@@ -9,7 +9,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: m1k1o/neko
   TAG_PREFIX: arm-
-  BASE_DOCKERFILE: Dockerfile.arm
+  RUNTIME_DOCKERFILE: Dockerfile.arm
   PLATFORMS: linux/arm64,linux/arm/v7
 
 jobs:
@@ -83,11 +83,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_ACCESS_TOKEN }}
       - 
+        name: Generate base Dockerfile
+        run: RUNTIME_DOCKERFILE=${{ env.RUNTIME_DOCKERFILE }} ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+      -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -151,8 +153,8 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .docker/${{ env.TAG_NAME }}
-          file: .docker/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
+          context: apps/${{ env.TAG_NAME }}
+          file: apps/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ghcr-intel.yml

@@ -9,7 +9,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: m1k1o/neko
   TAG_PREFIX: intel-
-  BASE_DOCKERFILE: Dockerfile.intel
+  RUNTIME_DOCKERFILE: Dockerfile.intel
   PLATFORMS: linux/amd64
 
 jobs:
@@ -48,11 +48,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_ACCESS_TOKEN }}
       - 
+        name: Generate base Dockerfile
+        run: RUNTIME_DOCKERFILE=${{ env.RUNTIME_DOCKERFILE }} ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+      -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -117,7 +119,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .docker/${{ env.TAG_NAME }}
+          context: apps/${{ env.TAG_NAME }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ghcr-nvidia.yml

@@ -9,7 +9,7 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: m1k1o/neko
   TAG_PREFIX: nvidia-
-  BASE_DOCKERFILE: Dockerfile.nvidia
+  RUNTIME_DOCKERFILE: Dockerfile.nvidia
   PLATFORMS: linux/amd64
 
 jobs:
@@ -48,11 +48,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_ACCESS_TOKEN }}
       - 
+        name: Generate base Dockerfile
+        run: RUNTIME_DOCKERFILE=${{ env.RUNTIME_DOCKERFILE }} ./docker/main.go -i Dockerfile.tmpl -o Dockerfile
+      -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -114,8 +116,8 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .docker/${{ env.TAG_NAME }}
-          file: .docker/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
+          context: apps/${{ env.TAG_NAME }}
+          file: apps/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}