Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set correct nonexample image tag

Browse source
This commit is contained in:
danilapog 2022-08-24 13:30:23 +03:00
parent 1a111b2a85
commit e637d670a4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/stable-build.yml vendored
View file

@ -100,10 +100,11 @@ jobs:
- name: build image - name: build image
run: | run: |
TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//') TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//')
SHORTER_TAG=$(echo ${TAG} | grep -o -P '^[\d]+\.[\d]+\.[\d]+')
PRODUCT_EDITION=${{ matrix.edition }} \ PRODUCT_EDITION=${{ matrix.edition }} \
PRODUCT_NAME=${{ env.PRODUCT_NAME }} \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} \
COMPANY_NAME=${{ env.COMPANY_NAME }} \ COMPANY_NAME=${{ env.COMPANY_NAME }} \
TAG=$TAG \ TAG=$SHORTER_TAG \
docker buildx bake \ docker buildx bake \
-f docker-bake.hcl ${{ matrix.images }} \ -f docker-bake.hcl ${{ matrix.images }} \
--push --push

4
docker-bake.hcl
View file

@ -68,9 +68,9 @@ target "documentserver-stable" {
} }
target "documentserver-nonexample" { target "documentserver-nonexample" {
tagret = "documentserver-nonexample" target = "documentserver-nonexample"
dockerfile = "Dockerfile.nonExample" dockerfile = "Dockerfile.nonExample"
tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${SHORTER_TAG}"-nonexample ] tags = [ "docker.io/${COMPANY_NAME}/${PRODUCT_NAME}${PREFIX_NAME}${PRODUCT_EDITION}:${TAG}-nonexample" ]
platforms = ["linux/amd64", "linux/arm64"] platforms = ["linux/amd64", "linux/arm64"]
args = { args = {
"PRODUCT_NAME": "${PRODUCT_NAME}" "PRODUCT_NAME": "${PRODUCT_NAME}"