diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f27688..0b945eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,10 @@ stages: - build - manifest +variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + before_script: - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')" @@ -30,7 +34,7 @@ build: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_dev: stage: build @@ -47,7 +51,7 @@ build_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_scheduled: stage: build @@ -64,7 +68,7 @@ build_scheduled: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] manifest: stage: manifest @@ -81,7 +85,7 @@ manifest: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd manifest_dev: stage: manifest @@ -96,7 +100,7 @@ manifest_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd manifest_scheduled: stage: manifest @@ -110,4 +114,4 @@ manifest_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd diff --git a/Dockerfile b/Dockerfile index d49aa49..758f39a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN \ curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu22.04/libnvidia-container.list | \ sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \ - curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ + curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ apt-get install -y --no-install-recommends \ bash \ btrfs-progs \ @@ -92,12 +92,16 @@ RUN \ tar xf \ /tmp/kasm.tar.gz -C \ / && \ + ALVERSION=$(cat /kasm_release/conf/database/seed_data/default_properties.yaml |awk '/alembic_version/ {print $2}') && \ curl -o \ /tmp/images.tar.gz -L \ - "https://kasm-ci.s3.amazonaws.com/1.14.0-images-combined.tar.gz" && \ + "https://kasm-ci.s3.amazonaws.com/1.15.0-images-combined.tar.gz" && \ tar xf \ /tmp/images.tar.gz -C \ / && \ + sed -i \ + '/alembic_version/s/.*/alembic_version: '${ALVERSION}'/' \ + /kasm_release/conf/database/seed_data/default_images_a* && \ sed -i 's/-N -e -H/-N -B -e -H/g' /kasm_release/upgrade.sh && \ echo "exit 0" > /kasm_release/install_dependencies.sh && \ echo "**** copy assets ****" && \ diff --git a/README.md b/README.md index e8c6a29..9b32ccd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It has a few core principles: version: "2.1" services: kasm: - image: kasmweb/workspaces:1.14.0 + image: kasmweb/workspaces:1.15.0 privileged: true container_name: kasm environment: @@ -51,7 +51,7 @@ docker run -d \ -v /path/to/profiles:/profiles `#optional` \ -v /dev/input:/dev/input `#optional` \ -v /run/udev/data:/run/udev/data `#optional` \ - kasmweb/workspaces:1.14.0 + kasmweb/workspaces:1.15.0 ``` | Parameter | Function | @@ -71,7 +71,7 @@ docker run -d \ | Tag | Description | | :----: | --- | -| 1.14.0 | Latest stable release | +| 1.15.0 | Latest stable release | | develop | Development head | | Architecture | Tag |