diff --git a/.github/workflows/itest.yml b/.github/workflows/itest.yml index c9e11c6f..edafaf77 100644 --- a/.github/workflows/itest.yml +++ b/.github/workflows/itest.yml @@ -16,7 +16,7 @@ on: required: true env: CIUXCONFIG: /tmp/ciux.sh - CIUX_VERSION: dev + CIUX_VERSION: 8ebbda06 GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} MINIMAL: ${{ inputs.minimal }} NOSCIENCE: ${{ inputs.noscience }} diff --git a/build.sh b/build.sh index 1ec1af0f..a27f1ec7 100755 --- a/build.sh +++ b/build.sh @@ -50,6 +50,10 @@ while getopts hs: c ; do done shift `expr $OPTIND - 1` +image=$(ciux get image $PWD --suffix "$suffix") + +# TODO use error code for anormal exit +# --check should return true or false if image=$(ciux get image --check $PWD --suffix "$suffix") then echo "Build cancelled, image $image already exists with current source code" @@ -66,5 +70,5 @@ else fi # Build image -docker image build --tag "$image" --build-arg spark_py_image="$ASTROLABSOFTWARE_FINK_SPARK_PY_IMAGE" "$DIR" --target $target +docker image build --tag "$IMAGE" --build-arg spark_py_image="$ASTROLABSOFTWARE_FINK_SPARK_PY_IMAGE" "$DIR" --target $target