From 624d51dcde9d6a1b291dd0b2dc80d7d20a16b789 Mon Sep 17 00:00:00 2001 From: edraft Date: Fri, 18 Apr 2025 14:01:31 +0200 Subject: [PATCH] Revert "Fixed build" This reverts commit 2a387f7fa63a4513d27e5c635e335b50f144c74b. --- .gitea/workflows/build dev.yaml | 9 +++------ .gitea/workflows/build.yaml | 8 +++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml index 22e9a79..24895cb 100644 --- a/.gitea/workflows/build dev.yaml +++ b/.gitea/workflows/build dev.yaml @@ -54,13 +54,12 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | cd api 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 uses: https://github.com/docker/login-action@v1 @@ -87,12 +86,11 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | 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 uses: https://github.com/docker/login-action@v1 @@ -119,7 +117,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Prepare web build run: | @@ -134,7 +131,7 @@ jobs: - name: Build docker run: | 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 uses: https://github.com/docker/login-action@v1 diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1f25681..2434777 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: run: | cd api 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 uses: https://github.com/docker/login-action@v1 @@ -86,12 +86,11 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | 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 uses: https://github.com/docker/login-action@v1 @@ -118,7 +117,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Prepare web build run: | @@ -133,7 +131,7 @@ jobs: - name: Build docker run: | 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 uses: https://github.com/docker/login-action@v1