multiple little fix & update publish workflow & comment failing arch

tchapacan · Apr 3, 2024 · 733d398 · 733d398
1 parent 7399688
commit 733d398
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
@@ -18,8 +18,8 @@ jobs:
         toolchain: [stable]
         arch:
           - {os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", cross: false}
-          - {os: "ubuntu-latest", target: "armv7-unknown-linux-gnueabihf", cross: true}
-          - {os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", cross: true}
+#          - {os: "ubuntu-latest", target: "armv7-unknown-linux-gnueabihf", cross: true}
+#          - {os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", cross: true}
 
     steps:
       - name: "Checkout repo 👉"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,9 +2,8 @@ name: "Release docker image"
 run-name: "Release docker image: ${{ github.event.release.name }} ⛑️"
 
 on:
-  push:
-#  release:
-#    types: [published]
+  release:
+    types: [published]
 
 jobs:
   docker:
@@ -37,12 +36,11 @@ jobs:
           echo "Flags:     ${{ steps.buildx.outputs.flags }}"
           echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
 
-#      - name: Login to DockerHub
-#        uses: docker/login-action@v2
-#        if: github.event_name != 'pull_request'
-#        with:
-#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -52,6 +50,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: false
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,8 @@
 FROM --platform=$BUILDPLATFORM rust:bookworm as vendor
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
-RUN echo "Running on: $BUILDPLATFORM / Building for $TARGETPLATFORM"
 WORKDIR /app
-
 COPY ./Cargo.toml .
-#COPY ./Cargo.lock .
 COPY ./src src
 RUN mkdir .cargo && cargo vendor > .cargo/config.toml
 
@@ -15,7 +12,6 @@ WORKDIR /app
 COPY --from=vendor /app/.cargo .cargo
 COPY --from=vendor /app/vendor vendor
 COPY ./Cargo.toml .
-#COPY ./Cargo.lock .
 COPY ./src src
 RUN cargo build --release