diff --git a/.github/workflows/eoefans-api-docker-ci.yml b/.github/workflows/eoefans-api-docker-ci.yml index d08b3f6..0e9aef4 100644 --- a/.github/workflows/eoefans-api-docker-ci.yml +++ b/.github/workflows/eoefans-api-docker-ci.yml @@ -10,6 +10,7 @@ env: IMAGE_REPO: "eoefans" IMAGE_NAME: "eoefans-api" DOCKERFILE_PATH: "./builder/api/Dockerfile" + DOCKER_BUILD_ARG: "SENTRY_RELEASE=$IMAGE_TAG VERSION=$IMAGE_TAG" # IMAGE_TAG: "" #we get tag using the action down below @@ -44,7 +45,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build the Docker image with tag - run: docker build . --file ${{ env.DOCKERFILE_PATH }} --tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} + run: docker build . --file ${{ env.DOCKERFILE_PATH }} --build-arg ${{ env.DOCKER_BUILD_ARG }} --tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} - name: push docker image with tag run: docker push ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} diff --git a/.github/workflows/eoefans-spider-docker-ci.yml b/.github/workflows/eoefans-spider-docker-ci.yml index 2400afa..b7e97b3 100644 --- a/.github/workflows/eoefans-spider-docker-ci.yml +++ b/.github/workflows/eoefans-spider-docker-ci.yml @@ -43,7 +43,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build the Docker image with tag - run: docker build . --file ${{ env.DOCKERFILE_PATH }} --tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} + run: docker build . --file ${{ env.DOCKERFILE_PATH }} --build-arg ${{ env.DOCKER_BUILD_ARG }} --tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} - name: push docker image with tag run: docker push ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} diff --git a/builder/api/Dockerfile b/builder/api/Dockerfile index 94e4e7d..e334bcf 100644 --- a/builder/api/Dockerfile +++ b/builder/api/Dockerfile @@ -10,7 +10,9 @@ COPY go.mod go.sum /work/ ENV GO111MODULE on #ENV GOPROXY=https://goproxy.cn,direct +ARG SENTRY_RELEASE ENV SENTRY_RELEASE $IMAGE_TAG +ARG VERSION ENV VERSION $IMAGE_TAG RUN go mod download @@ -26,7 +28,9 @@ RUN apk update --no-cache && apk add --no-cache ca-certificates tzdata ENV TZ Asia/Shanghai +ARG SENTRY_RELEASE ENV SENTRY_RELEASE $IMAGE_TAG +ARG VERSION ENV VERSION $IMAGE_TAG COPY --from=builder /work/api_server ./ diff --git a/builder/spider/Dockerfile b/builder/spider/Dockerfile index f1ae8cb..f559898 100644 --- a/builder/spider/Dockerfile +++ b/builder/spider/Dockerfile @@ -10,7 +10,9 @@ COPY go.mod go.sum /work/ ENV GO111MODULE on #ENV GOPROXY=https://goproxy.cn,direct +ARG SENTRY_RELEASE ENV SENTRY_RELEASE $IMAGE_TAG +ARG VERSION ENV VERSION $IMAGE_TAG RUN go mod download @@ -26,7 +28,9 @@ RUN apk update --no-cache && apk add --no-cache ca-certificates tzdata ENV TZ Asia/Shanghai +ARG SENTRY_RELEASE ENV SENTRY_RELEASE $IMAGE_TAG +ARG VERSION ENV VERSION $IMAGE_TAG COPY --from=builder /work/spider ./