Updated build
Some checks failed
Test before pr merge / test-lint (pull_request) Failing after 1m4s
Test before pr merge / test-translation-lint (pull_request) Failing after 32s
Test before pr merge / test-before-merge (pull_request) Failing after 1m27s

This commit is contained in:
Sven Heidemann 2025-04-18 11:15:15 +02:00
parent 165c140a25
commit 7b62022a83
3 changed files with 11 additions and 2 deletions

View File

@ -54,6 +54,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: version
path: version.txt
- name: Build docker
run: |
@ -86,6 +87,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: version
path: version.txt
- name: Build docker
run: |
@ -117,6 +119,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: version
path: version.txt
- name: Prepare web build
run: |
@ -131,7 +134,7 @@ jobs:
- name: Build docker
run: |
cd web
docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1

View File

@ -86,6 +86,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: version
path: version.txt
- name: Build docker
run: |
@ -117,6 +118,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: version
path: version.txt
- name: Prepare web build
run: |
@ -131,7 +133,7 @@ jobs:
- name: Build docker
run: |
cd web
docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1

View File

@ -4,4 +4,8 @@ RUN rm -rf /usr/share/nginx/html/*
COPY ./dist/open-redirect/browser/ /usr/share/nginx/html
RUN apk update
RUN apk add bash
ARG VERSION
RUN echo "{\"version\": \"${VERSION}\"}" > /usr/share/nginx/html/assets/version.json
CMD /bin/bash -c "envsubst '\$CONTAINER_NAME' < /etc/nginx/conf.d/nginx.conf.template > /etc/nginx/nginx.conf; nginx -g 'daemon off;'"