diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml index d8fa15b..a402e14 100644 --- a/.gitea/workflows/build dev.yaml +++ b/.gitea/workflows/build dev.yaml @@ -17,7 +17,8 @@ jobs: - name: Build docker run: | - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat version.txt) . + cd api + docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1 @@ -41,15 +42,18 @@ jobs: - name: Prepare web build run: | + cd web npm ci - name: Build web run: | + cd web npm run build - name: Build docker run: | - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt) . + cd web + docker build -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 7b8c4e2..de6354a 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,7 +17,8 @@ jobs: - name: Build docker run: | - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) . + cd api + docker build -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 @@ -41,15 +42,18 @@ jobs: - name: Prepare web build run: | + cd web npm ci - name: Build web run: | + cd web npm run build - name: Build docker run: | - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt) . + cd web + docker build -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/api/dockerfile b/api/dockerfile index b8e1231..8d90931 100644 --- a/api/dockerfile +++ b/api/dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM python:3.12.7-alpine +FROM python:3.12.8-alpine WORKDIR /app COPY ./src/ .