Mirrors/kasm-workspaces-dind
1
0
Fork 0
mirror of https://github.com/kasmtech/kasm-workspaces-dind.git synced 2026-01-23 02:35:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'build-updates' into 'develop'

Browse source 
bug bash problems with develop builds and fix ci logic

See merge request kasm-technologies/internal/kasm_workspaces_dind!2
This commit is contained in:
Justin Travis 2022-07-07 17:01:19 +00:00
commit bb1c4260b4
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -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

20
Dockerfile
View file

@ -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" && \