Some fixes to deb build

aescape-inc · Aug 22, 2024 · 6c8a6ab · 6c8a6ab
1 parent 4525343
commit 6c8a6ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ae-build-tag.yaml b/.github/workflows/ae-build-tag.yaml
@@ -116,23 +116,22 @@ jobs:
         -f packaging/distros/ubuntu/Dockerfile \
         .
         mkdir -p deb_output
-        echo docker run --rm -v "${PWD}/deb_output:/output" flb-ubuntu/22.04
         docker run --rm -v "${PWD}/deb_output:/output" flb-ubuntu/22.04
         ls -l deb_output
-        ls -l deb_output/fluent-bit_{{ env.AE_VERSION }}_amd64.deb
+        ls -l deb_output/fluent-bit_${{ env.AE_VERSION }}_amd64.deb
 
     - name: upload artifact
       uses: actions/upload-artifact@v4
       if: ${{ env.ACT != 'true' }}
       with:
         path: |
-          deb_output/fluent-bit_{{ env.AE_VERSION }}_amd64.deb
+          deb_output/fluent-bit_${{ env.AE_VERSION }}_amd64.deb
 
     - name: upload artifact to s3
       uses: keithweaver/[email protected]
       with:
         command: cp
-        source: deb_output/fluent-bit_{{ env.AE_VERSION }}_amd64.deb
+        source: deb_output/fluent-bit_${{ env.AE_VERSION }}_amd64.deb
         destination: s3://aescape-releases/fluent/
         aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile
@@ -165,4 +165,4 @@ ARG PKG_VERSION=1.0.0
 ENV PKG_VERSION=$PKG_VERSION
 
 VOLUME [ "/output" ]
-CMD [ "/bin/bash", "-c", "make -j 4 && cpack -G DEB -R ${PKG_VERSION} -D CPACK_DEBIAN_RUNTIME_FILE_NAME=fluent-bit_${PKG_VERSION}_amd64.deb && cp *.deb /output/" && chown -R 1000:1000 /output/ ]
+CMD [ "/bin/bash", "-c", "make -j 4 && cpack -G DEB -R ${PKG_VERSION} -D CPACK_DEBIAN_RUNTIME_FILE_NAME=fluent-bit_${PKG_VERSION}_amd64.deb && cp *.deb /output/ && chown -R 1000:1000 /output/" ]