From 41c744e0280614bfcfdd5a452d1d1089bc8112e1 Mon Sep 17 00:00:00 2001 From: aeweda Date: Thu, 25 Apr 2024 14:49:06 +0400 Subject: [PATCH] fix: inject api-endpoint during buildtime --- .github/workflows/production.yml | 6 ++++-- .github/workflows/staging.yml | 4 +++- ansible/docker/ui.dockerfile | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 622c5956..716ea380 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -47,11 +47,13 @@ jobs: sed -i "s##$API_ENDPOINT#g" ./ansible/docker-compose.yml sed -i "s##$STAGING_API_ENDPOINT#g" ./ansible/docker-compose.yml - - name: Pull & Rename Images + - name: Pull & Rebuild Images + env: + API_ENDPOINT: ${{ secrets.API_ENDPOINT }} run: | docker pull witnet/data-feed-app-ui:latest docker pull witnet/data-feed-app-api:latest - docker tag witnet/data-feed-app-ui:latest witnet/data-feed-app-ui:${{github.ref_name}} + docker build --build-arg API_ENDPOINT=${{ secrets.API_ENDPOINT }} -t witnet/data-feed-app-ui:${{github.ref_name}} -f ./ansible/docker/ui.dockerfile ./packages/ui docker tag witnet/data-feed-app-api:latest witnet/data-feed-app-api:${{github.ref_name}} - name: Publish Containers diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 97d7e52f..d1e46973 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -49,10 +49,12 @@ jobs: sed -i "s##$STAGING_API_ENDPOINT#g" ./ansible/docker-compose.yml - name: Build Containers + env: + STAGING_API_ENDPOINT: ${{ secrets.STAGING_API_ENDPOINT }} run: | docker pull witnet/data-feed-app-ui:latest docker pull witnet/data-feed-app-api:latest - docker build -t witnet/data-feed-app-ui:latest -f ./ansible/docker/ui.dockerfile ./packages/ui + docker build --build-arg API_ENDPOINT=${{ secrets.STAGING_API_ENDPOINT }} -t witnet/data-feed-app-ui:latest -f ./ansible/docker/ui.dockerfile ./packages/ui docker build -t witnet/data-feed-app-api:latest -f ./ansible/docker/api.dockerfile ./packages/api - name: Publish Containers diff --git a/ansible/docker/ui.dockerfile b/ansible/docker/ui.dockerfile index cbe58ee0..b24465d5 100644 --- a/ansible/docker/ui.dockerfile +++ b/ansible/docker/ui.dockerfile @@ -13,6 +13,9 @@ EXPOSE 8080 ENV HOST=0.0.0.0 ENV PORT=8080 +ARG API_ENDPOINT +ENV API_ENDPOINT=$API_ENDPOINT + RUN pnpm run build CMD [ "node", ".output/server/index.mjs"] \ No newline at end of file