File tree Expand file tree Collapse file tree 4 files changed +12
-12
lines changed
Expand file tree Collapse file tree 4 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -33,16 +33,16 @@ jobs:
3333 env :
3434 DISTRO : ${{ matrix.DISTRO }}
3535 PLATFORM : ${{ matrix.PLATFORM }}
36- IMAGE_REGISTRY_OPERATON : ${{ vars.IMAGE_REGISTRY_OPERATON }}
37- IMAGE_REGISTRY_TOMCAT : ${{ vars.IMAGE_REGISTRY_TOMCAT }}
36+ IMAGE_REPO_OPERATON : ${{ vars.IMAGE_REPO_OPERATON }}
37+ IMAGE_REPO_TOMCAT : ${{ vars.IMAGE_REPO_TOMCAT }}
3838 - name : Test
3939 run : ./test.sh
4040 working-directory : test
4141 env :
4242 DISTRO : ${{ matrix.DISTRO }}
4343 PLATFORM : ${{ matrix.PLATFORM }}
44- IMAGE_REGISTRY_OPERATON : ${{ vars.IMAGE_REGISTRY_OPERATON }}
45- IMAGE_REGISTRY_TOMCAT : ${{ vars.IMAGE_REGISTRY_TOMCAT }}
44+ IMAGE_REPO_OPERATON : ${{ vars.IMAGE_REPO_OPERATON }}
45+ IMAGE_REPO_TOMCAT : ${{ vars.IMAGE_REPO_TOMCAT }}
4646 publish :
4747 runs-on : ubuntu-20.04
4848 needs : build-and-test
7575 PLATFORMS : linux/arm64,linux/amd64
7676 DOCKERHUB_USERNAME : ${{ secrets.DOCKERHUB_USERNAME }}
7777 DOCKERHUB_PASSWORD : ${{ secrets.DOCKERHUB_PASSWORD }}
78- IMAGE_REGISTRY_OPERATON : ${{ vars.IMAGE_REGISTRY_OPERATON }}
79- IMAGE_REGISTRY_TOMCAT : ${{ vars.IMAGE_REGISTRY_TOMCAT }}
78+ IMAGE_REPO_OPERATON : ${{ vars.IMAGE_REPO_OPERATON }}
79+ IMAGE_REPO_TOMCAT : ${{ vars.IMAGE_REPO_TOMCAT }}
Original file line number Diff line number Diff line change 1313fi
1414
1515if [ " $DISTRO " == " run" ]; then
16- IMAGE_NAME=${IMAGE_REGISTRY_OPERATON } :${PLATFORM}
16+ IMAGE_NAME=${IMAGE_REPO_OPERATON } :${PLATFORM}
1717elif [ " $DISTRO " == " tomcat" ]; then
18- IMAGE_NAME=${IMAGE_REGISTRY_TOMCAT } :${PLATFORM}
18+ IMAGE_NAME=${IMAGE_REPO_TOMCAT } :${PLATFORM}
1919fi
2020
2121docker buildx build . \
Original file line number Diff line number Diff line change @@ -6,9 +6,9 @@ SNAPSHOT=${SNAPSHOT:-$(grep SNAPSHOT= Dockerfile | cut -d = -f 2)}
66PLATFORMS=${PLATFORMS:- linux/ amd64}
77
88if [ " $DISTRO " == " run" ]; then
9- IMAGE=${IMAGE_REGISTRY_OPERATON }
9+ IMAGE=${IMAGE_REPO_OPERATON }
1010elif [ " $DISTRO " == " tomcat" ]; then
11- IMAGE=${IMAGE_REGISTRY_TOMCAT }
11+ IMAGE=${IMAGE_REPO_TOMCAT }
1212fi
1313
1414function build_and_push {
Original file line number Diff line number Diff line change 11#! /bin/bash -xeu
22
33if [ " $DISTRO " == " run" ]; then
4- IMAGE_NAME=${IMAGE_REGISTRY_OPERATON } :${PLATFORM}
4+ IMAGE_NAME=${IMAGE_REPO_OPERATON } :${PLATFORM}
55elif [ " $DISTRO " == " tomcat" ]; then
6- IMAGE_NAME=${IMAGE_REGISTRY_TOMCAT } :${PLATFORM}
6+ IMAGE_NAME=${IMAGE_REPO_TOMCAT } :${PLATFORM}
77fi
88
99export IMAGE_NAME
You can’t perform that action at this time.
0 commit comments