From af098fd50a8ab0b0c3bd42da5661bf29f8288dc1 Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Tue, 7 Jan 2025 14:31:22 -0300 Subject: [PATCH] Fix publish workflow --- .github/workflows/publish.yml | 5 ++++- Dockerfile | 6 ++++-- docker-compose.yml | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c66196d..d6043ec 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,10 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Write deploy tag - run: echo "RELEASE_TAG=${GITHUB_REF_NAME}" > .env + run: echo "RELEASE_TAG=${GITHUB_REF_NAME}" > .env + + - name: Debug RELEASE_TAG + run: cat .env - name: Build Docker Compose 🏗️ run: docker compose build diff --git a/Dockerfile b/Dockerfile index 9fb8052..4211ff1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ ARG FAC_IMG_HTTPD_TAG=2.4.52-bullseye -ARG RELEASE_TAG FROM httpd:${FAC_IMG_HTTPD_TAG} SHELL ["bash", "-c"] +ARG RELEASE_TAG +RUN echo "RELEASE_TAG=${RELEASE_TAG}" + WORKDIR /usr/local/apache2/htdocs/ RUN set -e; \ @@ -21,4 +23,4 @@ COPY ./apache2_conf/httpd-mpm.conf /usr/local/apache2/conf/extra/httpd-mpm.conf RUN git clone https://github.com/lnls-sirius/control-system-constants; \ cd control-system-constants; \ - git checkout ${RELEASE_TAG} \ No newline at end of file + git checkout ${RELEASE_TAG} diff --git a/docker-compose.yml b/docker-compose.yml index 586b42e..36ee3e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,9 @@ services: image: 'ghcr.io/lnls-sirius/control-system-constants:${RELEASE_TAG}' build: context: . + args: + RELEASE_TAG: ${RELEASE_TAG} labels: - "br.com.lnls-sirius.department=FAC" ports: - - 20080:20080 \ No newline at end of file + - 20080:20080