Skip to content

Commit dce8abe

Browse files
committed
Remove docker build dependency from version check.
1 parent 10982ec commit dce8abe

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.github/workflows/buildpack-ubuntu2004.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,28 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020

21-
- name: Build image
22-
run: |
23-
docker build scripts/docker/${IMAGE_NAME} --file scripts/docker/${IMAGE_NAME}/Dockerfile.$IMAGE_VARIANT --tag $IMAGE_NAME
24-
25-
- name: Docker login
26-
run: echo ${GITHUB_TOKEN} | docker login docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin
27-
2821
- name: Check version
2922
run: |
30-
VERSION=$(docker inspect --format={{.Config.Labels.version}} $IMAGE_NAME)
23+
VERSION=$(grep "LABEL version" scripts/docker/${IMAGE_NAME}/Dockerfile.$IMAGE_VARIANT | awk -F'"' '$0=$2')
3124
echo "::set-env name=VERSION::$VERSION"
25+
26+
echo ${GITHUB_TOKEN} | docker login docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin
3227
VERSION_EXIST=$(docker pull -q $GITHUB_DOCKER_REPOSITORY/$IMAGE_NAME-$IMAGE_VARIANT:${VERSION} || echo false && true)
28+
docker logout
29+
3330
if [ "${VERSION_EXIST}" != "false" ]
3431
then
3532
echo ""
36-
echo "ERROR: Version ${VERSION} already exist for '$IMAGE_NAME-$IMAGE_VARIANT'. Aborting."
33+
echo "ERROR: version '${VERSION}' already exist for '$IMAGE_NAME-$IMAGE_VARIANT'. Aborting."
3734
echo ""
35+
3836
false
3937
fi
4038
39+
- name: Build image
40+
run: |
41+
docker build scripts/docker/${IMAGE_NAME} --file scripts/docker/${IMAGE_NAME}/Dockerfile.$IMAGE_VARIANT --tag $IMAGE_NAME
42+
4143
# - name: Test image
4244
# run: |
4345
# docker run -v ${PWD}:/tmp -e CI=1 $IMAGE_NAME /tmp/scripts/build.sh

0 commit comments

Comments
 (0)