update build and push docker image

ambrosus · Jun 21, 2024 · bd94001 · bd94001
1 parent abe2750
commit bd94001
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build_and_push.yaml b/.github/workflows/build_and_push.yaml
@@ -49,6 +49,8 @@ jobs:
  push: true
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
+ build-args: # Передаем аргумент ветки в Dockerfile
+ BRANCH: ${{ github.ref_name }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new
 
@@ -96,6 +98,8 @@ jobs:
  push: true
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
+ build-args: # Передаем аргумент ветки в Dockerfile
+ BRANCH: ${{ github.ref_name }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new
 
@@ -143,6 +147,8 @@ jobs:
  push: true
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
+ build-args: # Передаем аргумент ветки в Dockerfile
+ BRANCH: ${{ github.ref_name }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new
 
@@ -190,6 +196,8 @@ jobs:
  push: true
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
+ build-args: # Передаем аргумент ветки в Dockerfile
+ BRANCH: ${{ github.ref_name }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new
 

diff --git a/Dockerfile_db b/Dockerfile_db
@@ -2,8 +2,8 @@ FROM debian:bullseye-slim
 
 WORKDIR /app
 
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/target/release/airdao-gov-portal-db .
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/gov-portal-db /app/gov-portal-db
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/target/release/airdao-gov-portal-db .
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/gov-portal-db /app/gov-portal-db
 
 RUN apt-get update && apt-get install -y lsb-release ca-certificates libssl-dev && apt-get clean all
 

diff --git a/Dockerfile_mailer b/Dockerfile_mailer
@@ -2,8 +2,8 @@ FROM debian:bullseye-slim
 
 WORKDIR /app
 
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/target/release/airdao-gov-portal-mailer .
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/mailer /app/mailer
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/target/release/airdao-gov-portal-mailer .
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/mailer /app/mailer
 
 RUN apt-get update && apt-get install -y lsb-release ca-certificates libssl-dev && apt-get clean all
 

diff --git a/Dockerfile_verifier b/Dockerfile_verifier
@@ -2,8 +2,8 @@ FROM debian:bullseye-slim
 
 WORKDIR /app
 
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/target/release/airdao-gov-user-verifier .
-COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:main /tmp/builder/config /app/config
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/target/release/airdao-gov-user-verifier .
+COPY --from=ghcr.io/ambrosus/airdao-gov-user-binary:${BRANCH} /tmp/builder/config /app/config
 
 RUN apt-get update && apt-get install -y lsb-release ca-certificates libssl-dev && apt-get clean all