temp

torchiaf · Jan 3, 2025 · 3ae05b6 · 3ae05b6
1 parent 43475eb
commit 3ae05b6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/.github/actions/docker-push/action.yaml b/.github/actions/docker-push/action.yaml
@@ -20,7 +20,7 @@ inputs:
   file:
     description: ""
     required: true
-  working-directory:
+  context:
     description: ""
     required: true
   build-args:
@@ -49,13 +49,13 @@ runs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
       with:
-        working-directory: ${{ inputs.working-directory }}
+        working-directory: ${{ inputs.context }}
 
     - name: Build and push
       uses: docker/build-push-action@v6
       with:
         file: ${{ inputs.file }}
-        context: ${{ inputs.working-directory }}
+        context: ${{ inputs.context }}
         build-args: ${{ inputs.build-args }}
         platforms: ${{ inputs.platforms }}
         provenance: false

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -35,7 +35,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           image-name: controller
           tag-name: ${{ github.ref_name }}
-          working-directory: controller
+          context: controller
           file: controller/Dockerfile
           platforms: ''
 
@@ -53,18 +53,18 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - name: Run Build and Publish Docker image
-        id: devices
-        uses: ./.github/actions/docker-push
-        with:
-          registry: ${{ env.REGISTRY }}
-          repository_lc: ${{ env.REPO_LC }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          image-name: device/${{ matrix.device }}
-          tag-name: ${{ github.ref_name }}-${{ matrix.module }}
-          working-directory: modules/${{ matrix.module }}/devices/${{ matrix.device }}
-          file: modules/${{ matrix.module }}/devices/${{ matrix.device }}/Dockerfile
-          platforms: linux/arm64
+      # - name: Run Build and Publish Docker image
+      #   id: devices
+      #   uses: ./.github/actions/docker-push
+      #   with:
+      #     registry: ${{ env.REGISTRY }}
+      #     repository_lc: ${{ env.REPO_LC }}
+      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     image-name: device/${{ matrix.device }}
+      #     tag-name: ${{ github.ref_name }}-${{ matrix.module }}
+      #     context: modules/${{ matrix.module }}/devices/${{ matrix.device }}
+      #     file: modules/${{ matrix.module }}/devices/${{ matrix.device }}/Dockerfile
+      #     platforms: linux/arm64
 
   build-and-push-modules:
     runs-on: ubuntu-latest
@@ -87,7 +87,12 @@ jobs:
       - name: Generate Module Dockerfile
         id: generate_dockerfile
         shell: sh
-        run: sh ./scripts/generate-module-dockerfile.sh ${{ matrix.module }} ${{ steps.devices_list.outputs.devices }} ${{ env.REGISTRY }} ${{ github.repository_owner }} ${{ env.REPO_LC }} ${{ github.ref_name }}
+        run: sh ./scripts/generate-module-dockerfile.sh ${{ matrix.module }} ${{ steps.devices_list.outputs.devices }} ${{ env.REGISTRY }} ${{ github.repository_owner }} ${{ env.REPO_LC }} ${{ github.ref_name }} modules/${{ matrix.module }}/Dockerfile
+
+      - name: Print
+        shell: sh
+        run: cat modules/${{ matrix.module }}/Dockerfile
+
       - name: Run Build and Publish Docker image
         id: modules
         uses: ./.github/actions/docker-push
@@ -97,6 +102,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           image-name: module/${{ matrix.module }}
           tag-name: ${{ github.ref_name }}
-          working-directory: modules
-          file: ./Dockerfile
+          context: modules
+          file: modules/${{ matrix.module }}/Dockerfile
           platforms: linux/arm64
diff --git a/modules/raspberrypi3b/Dockerfile → modules/raspberrypi3b/build_template b/modules/raspberrypi3b/Dockerfile → modules/raspberrypi3b/build_template
diff --git a/modules/raspberrypi5/Dockerfile → modules/raspberrypi5/build_template b/modules/raspberrypi5/Dockerfile → modules/raspberrypi5/build_template
diff --git a/scripts/generate-module-dockerfile.sh b/scripts/generate-module-dockerfile.sh
@@ -8,19 +8,21 @@ GITHUB_REPOSITORY_OWNER=$4
 GITHUB_REPO=$5
 GITHUB_REF_NAME=$6
 
-echo "# Module: $MODULE, Devices: $2" > Dockerfile
+OUTPUT=$7
+
+echo "# Module: $MODULE, Devices: $2" > $OUTPUT
 
 for device in $DEVICES; do
-    echo "FROM $GITHUB_REGISTRY/$GITHUB_REPOSITORY_OWNER/$GITHUB_REPO/device/$device:$GITHUB_REF_NAME-$MODULE AS $device" >> Dockerfile
+    echo "FROM $GITHUB_REGISTRY/$GITHUB_REPOSITORY_OWNER/$GITHUB_REPO/device/$device:$GITHUB_REF_NAME-$MODULE AS $device" >> $OUTPUT
 done
-echo "" >> Dockerfile
+echo "" >> $OUTPUT
 
-echo "# Module: $MODULE build" >> Dockerfile
-cat modules/$MODULE/Dockerfile >> Dockerfile
+echo "# Module: $MODULE build" >> $OUTPUT
+cat modules/$MODULE/build_template >> $OUTPUT
 
 for device in $DEVICES; do
-    echo "COPY --from=$device /dist/$device /rpc_server" >> Dockerfile
+    echo "COPY --from=$device /dist/$device /rpc_server" >> $OUTPUT
 done
-echo "" >> Dockerfile
+echo "" >> $OUTPUT
 
-echo "CMD [\"./init\"]" >> Dockerfile
+echo "CMD [\"./init\"]" >> $OUTPUT