Revert "Fixed build"
Some checks failed
Build on push / prepare (push) Failing after 5s
Build on push / build-api (push) Has been skipped
Build on push / build-redirector (push) Has been skipped
Build on push / build-web (push) Has been skipped

This reverts commit 2a387f7fa6.
This commit is contained in:
Sven Heidemann 2025-04-18 14:01:31 +02:00
parent 2a387f7fa6
commit 624d51dcde
2 changed files with 6 additions and 11 deletions

View File

@ -54,13 +54,12 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: version name: version
path: version.txt
- name: Build docker - name: Build docker
run: | run: |
cd api cd api
echo "VERSION = \"$(cat version.txt)\"" > version.py echo "VERSION = \"$(cat version.txt)\"" > version.py
docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) . docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1
@ -87,12 +86,11 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: version name: version
path: version.txt
- name: Build docker - name: Build docker
run: | run: |
cd api cd api
docker build --no-cache -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt) . docker build --no-cache -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1
@ -119,7 +117,6 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: version name: version
path: version.txt
- name: Prepare web build - name: Prepare web build
run: | run: |
@ -134,7 +131,7 @@ jobs:
- name: Build docker - name: Build docker
run: | run: |
cd web cd web
docker build --no-cache --build-arg VERSION=$(cat version.txt) -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 - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1

View File

@ -59,7 +59,7 @@ jobs:
run: | run: |
cd api cd api
echo "VERSION = \"$(cat version.txt)\"" > version.py echo "VERSION = \"$(cat version.txt)\"" > version.py
docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) . docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1
@ -86,12 +86,11 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: version name: version
path: version.txt
- name: Build docker - name: Build docker
run: | run: |
cd api cd api
docker build --no-cache -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt) . docker build --no-cache -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) .
- name: Login to registry git.sh-edraft.de - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1
@ -118,7 +117,6 @@ jobs:
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: version name: version
path: version.txt
- name: Prepare web build - name: Prepare web build
run: | run: |
@ -133,7 +131,7 @@ jobs:
- name: Build docker - name: Build docker
run: | run: |
cd web cd web
docker build --no-cache --build-arg VERSION=$(cat version.txt) -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 - name: Login to registry git.sh-edraft.de
uses: https://github.com/docker/login-action@v1 uses: https://github.com/docker/login-action@v1