diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 826bfd6..5f27688 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ before_script: build: stage: build script: - - if [ "${SANITIZED_BRANCH}" != "develop"]; then export BUILD_TYPE=stable; fi + - if [ "${SANITIZED_BRANCH}" != "develop" ]; then export BUILD_TYPE=stable; fi - > docker build --build-arg RELEASE_TYPE=$BUILD_TYPE -t ${ORG_NAME}/workspaces:$(arch)-$SANITIZED_BRANCH @@ -52,7 +52,7 @@ build_dev: build_scheduled: stage: build script: - - if [ "${SANITIZED_ROLLING_BRANCH}" != "develop-rolling"]; then export BUILD_TYPE=stable; fi + - if [ "${SANITIZED_ROLLING_BRANCH}" != "develop-rolling" ]; then export BUILD_TYPE=stable; fi - > docker build --build-arg RELEASE_TYPE=$BUILD_TYPE -t ${ORG_NAME}/workspaces:$(arch)-$SANITIZED_ROLLING_BRANCH diff --git a/Dockerfile b/Dockerfile index 6a12117..3c5cd9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,17 +57,15 @@ RUN \ /tmp/s6-overlay-installer / && \ echo "**** setup wizard ****" && \ mkdir -p /wizard && \ - if [ -z ${KASM_VERSION+x} ]; then \ - if [ "${RELEASE_TYPE}" == "develop" ]; then \ - KASM_VERSION=$(curl -sX GET 'https://api.github.com/repos/kasmtech/kasm-install-wizard/releases' \ - | jq -r '.[] | select (.prerelease==true)' \ - | jq -rs 'max_by(.name | split(".") | map(tonumber)) | .name'); \ - fi; \ - if [ "${RELEASE_TYPE}" == "stable" ]; then \ - KASM_VERSION=$(curl -sX GET 'https://api.github.com/repos/kasmtech/kasm-install-wizard/releases/latest' \ - | jq -r '.name'); \ - fi; \ - fi && \ + if [ "${RELEASE_TYPE}" == "develop" ]; then \ + KASM_VERSION=$(curl -sX GET 'https://api.github.com/repos/kasmtech/kasm-install-wizard/releases' \ + | jq -r '[.[] | select (.prerelease==true)][0].name'); \ + fi; \ + if [ "${RELEASE_TYPE}" == "stable" ]; then \ + KASM_VERSION=$(curl -sX GET 'https://api.github.com/repos/kasmtech/kasm-install-wizard/releases/latest' \ + | jq -r '.name'); \ + fi; \ + echo $KASM_VERSION && \ curl -o \ /tmp/wizard.tar.gz -L \ "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \