diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 348bf2e9..032f2ed3 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -49,7 +49,7 @@ jobs: GITHUB_REF: ${{ github.ref}} run: | ref="$(echo ${GITHUB_REF} | cut -d'/' -f3)" - echo GITHUB_REF - $ref + echo "GITHUB_REF=${GITHUB_REF}, GITHUB_SHA=${GITHUB_SHA}, GIT_BRANCH=${ref}" echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin echo ${DOCKER_HUB_TOKEN} | docker login -u ${USERNAME} --password-stdin docker buildx build --push \ @@ -68,7 +68,7 @@ jobs: GITHUB_REF: ${{ github.ref}} run: | ref="$(echo ${GITHUB_REF} | cut -d'/' -f3)" - echo "GITHUB_REF=$ref, GITHUB_SHA=${GITHUB_SHA}" + echo "GITHUB_REF=${GITHUB_REF}, GITHUB_SHA=${GITHUB_SHA}, GIT_BRANCH=${ref}" echo ${GITHUB_PACKAGE_TOKEN} | docker login ghcr.io -u ${USERNAME} --password-stdin echo ${DOCKER_HUB_TOKEN} | docker login -u ${USERNAME} --password-stdin docker buildx build --push \ diff --git a/Dockerfile b/Dockerfile index c25de407..8ce15f49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM umputun/baseimage:buildgo-v1.8.0 as build-backend ARG CI +ARG GITHUB_REF +ARG GITHUB_SHA +ARG GIT_BRANCH ARG SKIP_BACKEND_TEST ARG BACKEND_TEST_TIMEOUT @@ -71,5 +74,6 @@ RUN ln -s /srv/remark42 /usr/bin/remark42 EXPOSE 8080 HEALTHCHECK --interval=30s --timeout=3s CMD curl --fail http://localhost:8080/ping || exit 1 + RUN chmod +x /srv/init.sh CMD ["/srv/remark42", "server"]