diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc01368..6d6697d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,26 @@ build_ubuntu_focal: tags: - aws-autoscale +build_ubuntu_jammy: + stage: build + image: ${ORG_NAME}/docker-buildx-private:develop + variables: + BUILD_PLATFORMS: "linux/amd64,linux/arm64" + script: + # get qemu ready + - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # prep the buildx env + - docker buildx create --use + # build for multiple architectures + - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-ubuntu-jammy-private:$SANITIZED_BRANCH -t ${ORG_NAME}/core-ubuntu-jammy-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-ubuntu-jammy:$SANITIZED_BRANCH -t ${ORG_NAME}/core-ubuntu-jammy:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg BASE_IMAGE="ubuntu:22.04" --build-arg START_XFCE4=1 --build-arg BG_IMG=bg_jammy.png -f dockerfile-kasm-core . + only: + - develop + - /^release\/.*$/ + except: + - schedules + tags: + - aws-autoscale + build_cuda_focal: stage: build script: @@ -186,7 +206,7 @@ build_opensuse_15: # prep the buildx env - docker buildx create --use # build for multiple architectures - - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_BRANCH -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg START_XFCE4=1 --build-arg BASE_IMAGE="opensuse/leap:15" --build-arg DISTRO="opensuse" -f dockerfile-kasm-core-suse . + - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_BRANCH -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg START_XFCE4=1 --build-arg BASE_IMAGE="opensuse/leap:15.3" --build-arg DISTRO="opensuse" -f dockerfile-kasm-core-suse . only: - develop - /^release\/.*$/ @@ -238,6 +258,27 @@ build_ubuntu_focal_dev: matrix: - TAG: [ aws-autoscale, aws-autoscale-arm64 ] +build_ubuntu_jammy_dev: + stage: build + script: + - > + docker build + -t ${ORG_NAME}/core-ubuntu-jammy-private:$(arch)-$SANITIZED_BRANCH + --build-arg START_PULSEAUDIO=1 + --build-arg BASE_IMAGE="ubuntu:22.04" + --build-arg START_XFCE4=1 + --build-arg BG_IMG=bg_jammy.png + -f dockerfile-kasm-core . + - docker push ${ORG_NAME}/core-ubuntu-jammy-private:$(arch)-$SANITIZED_BRANCH + except: + - develop + - /^release\/.*$/ + tags: + - ${TAG} + parallel: + matrix: + - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + build_cuda_focal_dev: stage: build script: @@ -389,7 +430,7 @@ build_opensuse_15_dev: -t ${ORG_NAME}/core-opensuse-15-private:$(arch)-$SANITIZED_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg START_XFCE4=1 - --build-arg BASE_IMAGE="opensuse/leap:15" + --build-arg BASE_IMAGE="opensuse/leap:15.3" --build-arg DISTRO="opensuse" -f dockerfile-kasm-core-suse . - docker push ${ORG_NAME}/core-opensuse-15-private:$(arch)-$SANITIZED_BRANCH @@ -436,6 +477,7 @@ test_multi_arch_dev: - core-kali-rolling-private - core-oracle-8-private - core-opensuse-15-private + - core-ubuntu-jammy-private test_single_arch_dev: stage: test @@ -493,6 +535,7 @@ manifest_dev: - core-kali-rolling-private - core-oracle-8-private - core-opensuse-15-private + - core-ubuntu-jammy-private link_tests_single_arch_dev: stage: linktests @@ -526,6 +569,7 @@ link_tests_multi_arch_dev: - core-kali-rolling-private - core-oracle-8-private - core-opensuse-15-private + - core-ubuntu-jammy-private # These jobs are for the "rolling" release of the images. They should only run for scheduled jobs and should only push the rolling tags build_ubuntu_bionic_scheduled: @@ -562,6 +606,23 @@ build_ubuntu_focal_scheduled: tags: - aws-autoscale +build_ubuntu_jammy_scheduled: + stage: build + image: ${ORG_NAME}/docker-buildx-private:develop + variables: + BUILD_PLATFORMS: "linux/amd64,linux/arm64" + script: + # get qemu ready + - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + # prep the buildx env + - docker buildx create --use + # build for multiple architectures + - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-ubuntu-jammy-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-ubuntu-jammy:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg BASE_IMAGE="ubuntu:22.04" --build-arg START_XFCE4=1 --build-arg BG_IMG=bg_jammy.png -f dockerfile-kasm-core . + only: + - schedules + tags: + - aws-autoscale + build_cuda_focal_schedules: stage: build script: @@ -658,7 +719,7 @@ build_opensuse_15_scheduled: # prep the buildx env - docker buildx create --use # build for multiple architectures - - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg START_XFCE4=1 --build-arg BASE_IMAGE="opensuse/leap:15" --build-arg DISTRO="opensuse" -f dockerfile-kasm-core-suse . + - docker buildx build --push --platform $BUILD_PLATFORMS -t ${ORG_NAME}/core-opensuse-15-private:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/core-opensuse-15:$SANITIZED_ROLLING_BRANCH --build-arg START_PULSEAUDIO=1 --build-arg START_XFCE4=1 --build-arg BASE_IMAGE="opensuse/leap:15.3" --build-arg DISTRO="opensuse" -f dockerfile-kasm-core-suse . only: - schedules tags: @@ -705,3 +766,4 @@ update_readmes: - core-cuda-focal - core-ubuntu-bionic - core-ubuntu-focal + - core-ubuntu-jammy diff --git a/dockerfile-kasm-core b/dockerfile-kasm-core index ff19f62..9b3ffaa 100644 --- a/dockerfile-kasm-core +++ b/dockerfile-kasm-core @@ -161,7 +161,8 @@ RUN touch $STARTUPDIR/wm.log \ && mkdir -p $STARTUPDIR/kasmrx/Downloads \ && chown 1000:1000 $STARTUPDIR/kasmrx/Downloads \ && chown -R root:root /usr/local/bin \ - && chown 1000:root /var/run/pulse + && chown 1000:root /var/run/pulse \ + && rm -Rf /home/kasm-default-profile/.launchpadlib USER 1000 diff --git a/docs/core-ubuntu-jammy/README.md b/docs/core-ubuntu-jammy/README.md new file mode 100644 index 0000000..30628e5 --- /dev/null +++ b/docs/core-ubuntu-jammy/README.md @@ -0,0 +1,7 @@ +# About This Image + +This image contains a browser-accessible version of Ubuntu Jammy. + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/core-ubuntu-jammy.png "Image Screenshot" diff --git a/docs/core-ubuntu-jammy/description.txt b/docs/core-ubuntu-jammy/description.txt new file mode 100644 index 0000000..4d277ce --- /dev/null +++ b/docs/core-ubuntu-jammy/description.txt @@ -0,0 +1 @@ +Ubuntu Jammy base image for Kasm Workspaces diff --git a/src/common/resources/images/bg_jammy.png b/src/common/resources/images/bg_jammy.png new file mode 100644 index 0000000..775eb8e Binary files /dev/null and b/src/common/resources/images/bg_jammy.png differ diff --git a/src/ubuntu/install/extra/kali.sh b/src/ubuntu/install/extra/kali.sh index a2c4427..046e7fc 100644 --- a/src/ubuntu/install/extra/kali.sh +++ b/src/ubuntu/install/extra/kali.sh @@ -18,24 +18,3 @@ apt-get install -y p11-kit-modules rm -rf /usr/lib/firefox-esr/libnssckbi.so ln /usr/lib/$(arch)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox-esr/libnssckbi.so - - -# Kali includes chromium by default. -CHROME_ARGS="--password-store=basic --no-sandbox --disable-gpu --user-data-dir --no-first-run" - -mv /usr/bin/chromium /usr/bin/chromium-orig -cat >/usr/bin/chromium <> /etc/chromium/policies/managed/default_managed_policy.json </etc/X11/xinit/xinitrc <