Fixed build
This commit is contained in:
parent
8a130a4868
commit
a967b19bd2
@ -17,7 +17,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Get Date and Build Number
|
- name: Get Date and Build Number
|
||||||
run: |
|
run: |
|
||||||
git fetch
|
git fetch --tags
|
||||||
git tag
|
git tag
|
||||||
DATE=$(date +'%Y.%m.%d')
|
DATE=$(date +'%Y.%m.%d')
|
||||||
TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
|
TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
|
||||||
@ -54,12 +54,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
|
||||||
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
|
||||||
@ -71,7 +70,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt)
|
||||||
|
|
||||||
build-redirector:
|
build-redirector:
|
||||||
runs-on: [runner]
|
runs-on: [runner]
|
||||||
@ -87,7 +86,6 @@ 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: |
|
||||||
@ -103,7 +101,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt)
|
||||||
|
|
||||||
build-web:
|
build-web:
|
||||||
runs-on: [runner]
|
runs-on: [runner]
|
||||||
@ -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
|
||||||
@ -145,4 +142,4 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt)
|
||||||
|
@ -17,7 +17,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Get Date and Build Number
|
- name: Get Date and Build Number
|
||||||
run: |
|
run: |
|
||||||
git fetch
|
git fetch --tags
|
||||||
git tag
|
git tag
|
||||||
DATE=$(date +'%Y.%m.%d')
|
DATE=$(date +'%Y.%m.%d')
|
||||||
TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
|
TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
|
||||||
@ -58,7 +58,7 @@ jobs:
|
|||||||
- 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
|
||||||
@ -70,7 +70,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt)
|
||||||
|
|
||||||
build-redirector:
|
build-redirector:
|
||||||
runs-on: [runner]
|
runs-on: [runner]
|
||||||
@ -86,7 +86,6 @@ 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: |
|
||||||
@ -102,7 +101,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt)
|
||||||
|
|
||||||
build-web:
|
build-web:
|
||||||
runs-on: [runner]
|
runs-on: [runner]
|
||||||
@ -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
|
||||||
@ -144,4 +142,4 @@ jobs:
|
|||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
run: |
|
run: |
|
||||||
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt)
|
docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt)
|
||||||
|
Loading…
Reference in New Issue
Block a user