Change base image to Ubuntu Jammy (#1017)

kylos101 · web-flow · commit 646394045ce6 · 2023-03-06T11:23:53.000-05:00
* Update buildkit and dazzle dependencies * `buildkit` 0.10.6 -> 0.11.2 * `dazzle` v0.1.13 -> v0.1.14 * Update Dazzle and consolidate source of truths for dazzle and buildkit * Update to Jammy * Use asdf to manage Elxir and Erlang * Go 1.18 was failing, replace with 1.20 * Update Rust Co-authored-by: c3potheds * Bump Ruby * Deprecate Ruby 2.7 and update 3.0 to 3.0.5 2.7 isn't supported in Jammy, and going EOL March 31, 2023. Fix Ruby 3+. For 3.0, override the OpenSSL version. * Fix Java tests * Install OpenSSL conditionally for Ruby 3.0 * Add cmake to tool-brew chunk Fixes #1020 * Support Mongo on Jammy * Node changes * LTS from 16 to 18 * Current from 18 to 19 * Fix postgresql 12 on Jammy * Patch nvm version * Bump Python and Ruby in gitpod/workspace-full * Fix yugabytedb on Jammy, combo not compatible with Python chunk tests
diff --git a/.github/promote-images.yml b/.github/promote-images.yml
@@ -20,7 +20,6 @@
     workspace-python-3.9: "20.*"
     workspace-python-3.10: "20.*"
     workspace-python-3.11: "20.*"
-    workspace-ruby-2: "20.*"
     workspace-ruby-3: "20.*"
     workspace-ruby-3.0: "20.*"
     workspace-ruby-3.1: "20.*"
diff --git a/.github/sync-containers.yml b/.github/sync-containers.yml
@@ -17,7 +17,6 @@ sync:
     - python-3.9
     - python-3.10
     - python-3.11
-    - ruby-2
     - ruby-3
     - ruby-3.0
     - ruby-3.1
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -5,6 +5,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DAZZLE_VERSION: 0.1.15
+      BUILDKIT_VERSION: 0.11.2
     steps:
       - name: 📥 Checkout workspace-images
         uses: actions/checkout@v3
@@ -24,11 +27,11 @@ jobs:
 
       - name: 🔆 Install dazzle
         run: |
-          curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.13/dazzle_0.1.13_Linux_x86_64.tar.gz | sudo tar -xvz -C /usr/local/bin
+          curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v${{env.DAZZLE_VERSION}}/dazzle_${{env.DAZZLE_VERSION}}_Linux_x86_64.tar.gz | sudo tar -xvz -C /usr/local/bin
 
       - name: 🏗️ Setup buildkit
         run: |
-          curl -sSL https://github.com/moby/buildkit/releases/download/v0.10.6/buildkit-v0.10.6.linux-amd64.tar.gz | sudo tar xvz -C /usr
+          curl -sSL https://github.com/moby/buildkit/releases/download/v${{env.BUILDKIT_VERSION}}/buildkit-v${{env.BUILDKIT_VERSION}}.linux-amd64.tar.gz | sudo tar xvz -C /usr
           sudo buildkitd --oci-worker=true --oci-worker-net=host --debug --group docker &
           sudo su -c "while ! test -S /run/buildkit/buildkitd.sock; do sleep 0.1; done"
           sudo chmod +777 /run/buildkit/buildkitd.sock
diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml
@@ -23,6 +23,8 @@ jobs:
       GAR_IMAGE_REGISTRY: europe-docker.pkg.dev
       DH_IMAGE_REGISTRY: registry.hub.docker.com
       IAM_SERVICE_ACCOUNT: workspace-images-gha-sa@gitpod-artifacts.iam.gserviceaccount.com
+      DAZZLE_VERSION: 0.1.15
+      BUILDKIT_VERSION: 0.11.2
 
     steps:
       - name: 📥 Checkout workspace-images
@@ -43,7 +45,7 @@ jobs:
 
       - name: 🔆 Install dazzle
         run: |
-          curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.13/dazzle_0.1.13_Linux_x86_64.tar.gz | sudo tar -xvz -C /usr/local/bin
+          curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v${{env.DAZZLE_VERSION}}/dazzle_${{env.DAZZLE_VERSION}}_Linux_x86_64.tar.gz | sudo tar -xvz -C /usr/local/bin
 
       - name: 🔆 Install skopeo
         run: |
@@ -56,7 +58,7 @@ jobs:
 
       - name: 🏗️ Setup buildkit
         run: |
-          curl -sSL https://github.com/moby/buildkit/releases/download/v0.10.6/buildkit-v0.10.6.linux-amd64.tar.gz | sudo tar xvz -C /usr
+          curl -sSL https://github.com/moby/buildkit/releases/download/v${{env.BUILDKIT_VERSION}}/buildkit-v${{env.BUILDKIT_VERSION}}.linux-amd64.tar.gz | sudo tar xvz -C /usr
           sudo buildkitd --oci-worker=true --oci-worker-net=host --debug --group docker &
           sudo su -c "while ! test -S /run/buildkit/buildkitd.sock; do sleep 0.1; done"
           sudo chmod +777 /run/buildkit/buildkitd.sock
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -2,14 +2,15 @@ FROM gitpod/workspace-full
 
 ENV RETRIGGER=3
 
-ENV BUILDKIT_VERSION=0.10.6
+ENV BUILDKIT_VERSION=0.11.2
 ENV BUILDKIT_FILENAME=buildkit-v${BUILDKIT_VERSION}.linux-amd64.tar.gz
+ENV DAZZLE_VERSION=0.1.15
 
 USER root
 
 # Install dazzle, buildkit and pre-commit
 RUN curl -sSL https://github.com/moby/buildkit/releases/download/v${BUILDKIT_VERSION}/${BUILDKIT_FILENAME} | tar -xvz -C /usr
-RUN curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.13/dazzle_0.1.13_Linux_x86_64.tar.gz | tar -xvz -C /usr/local/bin
+RUN curl -sSL https://github.com/gitpod-io/dazzle/releases/download/v${DAZZLE_VERSION}/dazzle_${DAZZLE_VERSION}_Linux_x86_64.tar.gz | tar -xvz -C /usr/local/bin
 RUN curl -sSL https://github.com/mvdan/sh/releases/download/v3.5.1/shfmt_v3.5.1_linux_amd64 -o /usr/bin/shfmt \
     && chmod +x /usr/bin/shfmt
 RUN install-packages shellcheck \
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -159,7 +159,7 @@ e.g.
     # fetch keyring over https connection and unpack it using gpg's --dearmor option
     curl -fsSL https://apt.my-secure.org/my-unofficial-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/my-unofficial-repo.gpg.key
     # and then add them to a apt key sources list.
-    echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/focal/ \
+    echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/jammy/ \
     my-unofficial-repo-toolchain main" | sudo tee /etc/apt/sources.list.d/my-unofficial-repo.list > /dev/null
     ```
 
diff --git a/README.md b/README.md
@@ -54,7 +54,6 @@ Each contains a set of chunks: a common base, and a language, and includes Docke
 - [`gitpod/workspace-node`](https://hub.docker.com/r/gitpod/workspace-node) ✅
 - [`gitpod/workspace-node-lts`](https://hub.docker.com/r/gitpod/workspace-node-lts) ✅
 - [`gitpod/workspace-python`](https://hub.docker.com/r/gitpod/workspace-python) ✅
-- [`gitpod/workspace-ruby-2`](https://hub.docker.com/r/gitpod/workspace-ruby-2) ✅
 - [`gitpod/workspace-ruby-3`](https://hub.docker.com/r/gitpod/workspace-ruby-3) ✅
 - [`gitpod/workspace-ruby-3.0`](https://hub.docker.com/r/gitpod/workspace-ruby-3.0) ✅
 - [`gitpod/workspace-ruby-3.1`](https://hub.docker.com/r/gitpod/workspace-ruby-3.1) ✅
@@ -87,6 +86,7 @@ These images are no longer being published:
 
 - gitpod/workspace-python-3.6 (please use [`gitpod/workspace-python-3.7`](https://hub.docker.com/r/gitpod/workspace-python-3.7) instead)
 - gitpod/workspace-postgresql (please use [`gitpod/workspace-postgres`](https://hub.docker.com/r/gitpod/workspace-postgres) instead)
+- gitpod/workspace-ruby-2 (please use [`gitpod/workspace-ruby-3.2`](https://hub.docker.com/r/gitpod/workspace-ruby-3.2) instead)
 
 ## Contributing
 
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:focal
+FROM buildpack-deps:jammy
 
 COPY install-packages upgrade-packages /usr/bin/
 
diff --git a/base/install-packages b/base/install-packages
@@ -26,7 +26,7 @@ if [[ $EUID != 0 ]]; then
 fi
 
 # Set a runlevel to avoid invoke-rc.d warnings
-# http://manpages.ubuntu.com/manpages/focal/man8/runlevel.8.html#environment
+# http://manpages.ubuntu.com/manpages/jammy/man8/runlevel.8.html#environment
 # shellcheck disable=SC2034
 RUNLEVEL=1
 
diff --git a/chunks/lang-c/Dockerfile b/chunks/lang-c/Dockerfile
@@ -7,8 +7,8 @@ USER root
 ENV TRIGGER_REBUILD=1
 
 RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg \
-    && echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/focal/ \
-    llvm-toolchain-focal-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
+    && echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ \
+    llvm-toolchain-jammy-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
     && apt update \
     && install-packages \
         clang \
diff --git a/chunks/lang-elixir/Dockerfile b/chunks/lang-elixir/Dockerfile
@@ -6,9 +6,23 @@ USER root
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
 ENV TRIGGER_REBUILD=1
 
-RUN cd /tmp \
-	&& wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb \
-	&& dpkg -i erlang-solutions_2.0_all.deb \
-	&& install-packages elixir
-
 USER gitpod
+
+# Install asdf to make it easier to manage elixir versions
+#
+# Why?
+# 1. At the time of this writing, `apt-get install elixir` was installing
+# a version that was not compatible with glibc in Ubuntu Jammy.
+# 2. This makes it explicit as to what versions we're installing.
+# 3. It'll give users the ability to easily make changes at runtime to experiment
+RUN	git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.11.1
+RUN echo ". "$HOME/.asdf/asdf.sh"" >> /home/gitpod/.bashrc.d/100-asdf
+RUN echo ". "$HOME/.asdf/completions/asdf.bash"" >> /home/gitpod/.bashrc.d/100-asdf
+ENV PATH=/home/gitpod/.asdf/bin:/home/gitpod/.asdf/shims:$PATH
+
+RUN asdf plugin-add erlang https://github.com/asdf-vm/asdf-erlang.git
+RUN asdf plugin-add elixir https://github.com/asdf-vm/asdf-elixir.git
+RUN asdf install erlang 25.2.2
+RUN asdf install elixir 1.13.4-otp-25
+RUN asdf global erlang 25.2.2
+RUN asdf global elixir 1.13.4-otp-25
diff --git a/chunks/lang-go/Dockerfile b/chunks/lang-go/Dockerfile
@@ -11,19 +11,20 @@ ENV GO_VERSION=${GO_VERSION}
 ENV GOPATH=$HOME/go-packages
 ENV GOROOT=$HOME/go
 ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
-RUN curl -fsSL https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz | tar xzs && \
+RUN curl -fsSL https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz | tar xzs
 # install VS Code Go tools for use with gopls as per https://github.com/golang/vscode-go/blob/master/docs/tools.md
 # also https://github.com/golang/vscode-go/blob/27bbf42a1523cadb19fad21e0f9d7c316b625684/src/goTools.ts#L139
-    go install -v github.com/uudashr/gopkgs/cmd/gopkgs@v2 && \
-    go install -v github.com/ramya-rao-a/go-outline@latest && \
-    go install -v github.com/cweill/gotests/gotests@latest && \
-    go install -v github.com/fatih/gomodifytags@latest && \
-    go install -v github.com/josharian/impl@latest && \
-    go install -v github.com/haya14busa/goplay/cmd/goplay@latest && \
-    go install -v github.com/go-delve/delve/cmd/dlv@latest && \
-    go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@latest && \
-    go install -v golang.org/x/tools/gopls@latest && \
-    go install -v honnef.co/go/tools/cmd/staticcheck@latest && \
-    sudo rm -rf $GOPATH/src $GOPATH/pkg $HOME/.cache/go $HOME/.cache/go-build && \
+RUN go install -v github.com/uudashr/gopkgs/cmd/gopkgs@v2 \
+&& go install -v github.com/ramya-rao-a/go-outline@latest \
+&& go install -v github.com/cweill/gotests/gotests@latest \
+&& go install -v github.com/fatih/gomodifytags@latest \
+&& go install -v github.com/josharian/impl@latest \
+&& go install -v github.com/haya14busa/goplay/cmd/goplay@latest \
+&& go install -v github.com/go-delve/delve/cmd/dlv@latest \
+&& go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@latest \
+&& go install -v golang.org/x/tools/gopls@latest \
+&& go install -v honnef.co/go/tools/cmd/staticcheck@latest
+
+RUN sudo rm -rf $GOPATH/src $GOPATH/pkg $HOME/.cache/go $HOME/.cache/go-build && \
     printf '%s\n' 'export GOPATH=/workspace/go' \
-                  'export PATH=$GOPATH/bin:$PATH' > $HOME/.bashrc.d/300-go
+    'export PATH=$GOPATH/bin:$PATH' > $HOME/.bashrc.d/300-go
diff --git a/chunks/lang-go/chunk.yaml b/chunks/lang-go/chunk.yaml
@@ -1,7 +1,7 @@
 variants:
-  - name: "1.18.10"
-    args:
-      GO_VERSION: 1.18.10
   - name: "1.19.5"
     args:
       GO_VERSION: 1.19.5
+  - name: "1.20"
+    args:
+      GO_VERSION: 1.20
diff --git a/chunks/lang-node/Dockerfile b/chunks/lang-node/Dockerfile
@@ -12,7 +12,7 @@ ENV NODE_VERSION=${NODE_VERSION}
 ENV PNPM_HOME=/home/gitpod/.pnpm
 ENV PATH=/home/gitpod/.nvm/versions/node/v${NODE_VERSION}/bin:/home/gitpod/.yarn/bin:${PNPM_HOME}:$PATH
 
-RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | PROFILE=/dev/null bash \
+RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | PROFILE=/dev/null bash \
     && bash -c ". .nvm/nvm.sh \
         && nvm install v${NODE_VERSION} \
         && nvm alias default v${NODE_VERSION} \
diff --git a/chunks/lang-node/chunk.yaml b/chunks/lang-node/chunk.yaml
@@ -1,7 +1,7 @@
 variants:
-  - name: "16"
-    args:
-      NODE_VERSION: 16.19.1
   - name: "18"
     args:
       NODE_VERSION: 18.14.2
+  - name: "19"
+    args:
+      NODE_VERSION: 19.7.0
diff --git a/chunks/lang-ruby/Dockerfile b/chunks/lang-ruby/Dockerfile
@@ -6,21 +6,21 @@ ARG RUBY_VERSION
 USER gitpod
 
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
-ENV TRIGGER_REBUILD=1
-
-RUN curl -fsSL https://rvm.io/mpapis.asc | gpg --import - \
-    && curl -fsSL https://rvm.io/pkuczynski.asc | gpg --import - \
-    && curl -fsSL https://get.rvm.io | bash -s stable \
-    && bash -lc " \
-        rvm requirements \
-        && rvm install ${RUBY_VERSION} \
-        && rvm use ${RUBY_VERSION} --default \
-        && rvm rubygems current \
-        && gem install bundler --no-document \
-        && gem install solargraph --no-document" \
-    && echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*' >> /home/gitpod/.bashrc.d/70-ruby
+ENV TRIGGER_REBUILD=2
+
+RUN curl -fsSL https://rvm.io/mpapis.asc | gpg --import -
+RUN curl -fsSL https://rvm.io/pkuczynski.asc | gpg --import -
+RUN curl -fsSL https://get.rvm.io | bash -s stable
+
+ADD ./install.sh /tmp
+RUN /tmp/install.sh $RUBY_VERSION
+
+
+
+
+RUN echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*' >> /home/gitpod/.bashrc.d/70-ruby
 RUN echo "rvm_gems_path=/workspace/.rvm" > ~/.rvmrc
 
 ENV GEM_HOME=/workspace/.rvm
 ENV GEM_PATH=$GEM_HOME:$GEM_PATH
-ENV PATH=/workspace/.rvm/bin:$PATH
+ENV PATH=/home/gitpod/.rvm/bin:$PATH
diff --git a/chunks/lang-ruby/chunk.yaml b/chunks/lang-ruby/chunk.yaml
@@ -1,13 +1,10 @@
 variants:
-  - name: "2.7"
-    args:
-      RUBY_VERSION: 2.7.6
   - name: "3.0"
     args:
-      RUBY_VERSION: 3.0.4
+      RUBY_VERSION: 3.0.5
   - name: "3.1"
     args:
-      RUBY_VERSION: 3.1.2
+      RUBY_VERSION: 3.1.3
   - name: "3.2"
     args:
-      RUBY_VERSION: 3.2.0
+      RUBY_VERSION: 3.2.1
diff --git a/chunks/lang-ruby/install.sh b/chunks/lang-ruby/install.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -euo pipefail
+
+RUBY_VERSION=$1
+
+# the version of openssl changed in Jammy, Ruby 3.0 needs an older version
+# https://github.com/rvm/rvm/issues/5209#issuecomment-1114159447
+# another option: https://github.com/rvm/rvm/issues/5209#issuecomment-1134927685 or sudo apt install libssl-dev=1.1.1l-1ubuntu1.4
+if grep -q "3.0." <<<"${RUBY_VERSION}"; then
+	bash -lc "
+        rvm requirements \
+        && rvm pkg install openssl \
+        && rvm install \"${RUBY_VERSION}\" --with-openssl-dir=\"${HOME}\"/.rvm/usr --default \
+        && rvm alias create default \"${RUBY_VERSION}\" \
+        && rvm rubygems current \
+        && gem install bundler --no-document \
+        && gem install solargraph --no-document"
+else
+	# Ruby 3.1 and higher do not
+	bash -lc "
+        rvm requirements \
+        && rvm install \"${RUBY_VERSION}\" --default \
+        && rvm alias create default \"${RUBY_VERSION}\" \
+        && rvm rubygems current \
+        && gem install bundler --no-document \
+        && gem install solargraph --no-document"
+fi
diff --git a/chunks/lang-rust/Dockerfile b/chunks/lang-rust/Dockerfile
@@ -4,7 +4,7 @@ FROM ${base}
 USER gitpod
 
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
-ENV TRIGGER_REBUILD=4
+ENV TRIGGER_REBUILD=5
 
 ENV PATH=$HOME/.cargo/bin:$PATH
 
diff --git a/chunks/tool-brew/Dockerfile b/chunks/tool-brew/Dockerfile
@@ -12,5 +12,4 @@ ENV MANPATH="$MANPATH:/home/linuxbrew/.linuxbrew/share/man"
 ENV INFOPATH="$INFOPATH:/home/linuxbrew/.linuxbrew/share/info"
 ENV HOMEBREW_NO_AUTO_UPDATE=1
 
-RUN sudo apt remove -y cmake \
-    && brew install cmake
+RUN brew install cmake
diff --git a/chunks/tool-mongodb/Dockerfile b/chunks/tool-mongodb/Dockerfile
@@ -6,11 +6,20 @@ USER gitpod
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
 ENV TRIGGER_REBUILD=1
 
+# Install MongoDB Shell aka MongoSH (was part of Mongo 5, but, is separate now)
+RUN mkdir -p /tmp/mongosh && \
+    cd /tmp/mongosh && \
+    wget -qOmongosh.tgz https://downloads.mongodb.com/compass/mongosh-1.8.0-linux-x64.tgz && \
+    tar xf mongosh.tgz && \
+    cd mongosh-* && \
+    sudo cp bin/* /usr/local/bin/ && \
+    rm -rf /tmp/mongosh
+
 # Install MongoDB
 # Source: https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu-tarball/#install-mongodb-community-edition
 RUN mkdir -p /tmp/mongodb && \
     cd /tmp/mongodb && \
-    wget -qOmongodb.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.2.tgz && \
+    wget -qOmongodb.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-6.0.4.tgz && \
     tar xf mongodb.tgz && \
     cd mongodb-* && \
     sudo cp bin/* /usr/local/bin/ && \
diff --git a/chunks/tool-postgresql/Dockerfile b/chunks/tool-postgresql/Dockerfile
@@ -7,7 +7,9 @@ ENV PGWORKSPACE="/workspace/.pgsql"
 ENV PGDATA="$PGWORKSPACE/data"
 
 # Install PostgreSQL
-RUN sudo install-packages postgresql-12 postgresql-contrib-12
+RUN sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && \
+    sudo install-packages postgresql-12 postgresql-contrib-12
 
 # Setup PostgreSQL server for user gitpod
 ENV PATH="/usr/lib/postgresql/12/bin:$PATH"
diff --git a/chunks/tool-tailscale/Dockerfile b/chunks/tool-tailscale/Dockerfile
@@ -6,8 +6,8 @@ USER root
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
 ENV TRIGGER_REBUILD=3
 
-RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key add - \
-    && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.list | sudo tee /etc/apt/sources.list.d/tailscale.list \
+RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | sudo apt-key add - \
+    && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.list | sudo tee /etc/apt/sources.list.d/tailscale.list \
     && apt-get update \
     && apt-get install -y tailscale \
     && rm /etc/apt/sources.list.d/tailscale.list \
diff --git a/chunks/tool-yugabytedb/Dockerfile b/chunks/tool-yugabytedb/Dockerfile
@@ -7,6 +7,7 @@ ARG YB_VERSION
 ARG YB_BUILD
 ARG YB_BIN_PATH=/usr/local/yugabyte
 ARG ROLE=gitpod
+ARG PYTHON_VERSION
 
 USER $ROLE
 # create bin and data path
@@ -22,6 +23,17 @@ RUN curl -sSLo ./yugabyte.tar.gz https://downloads.yugabyte.com/releases/${YB_VE
   && chmod +x $YB_BIN_PATH/bin/* \
   && rm ./yugabyte.tar.gz
 
+# python is a required dependency of ycqlsh
+# but it doesn't support Python 3.10+ due to https://github.com/yugabyte/cqlsh/issues/11, install 3.9 for now
+# when building yugabyte combos, if our base is full, related python chunk tests fail
+# so, use base as the combo ref, add chunks, but ignore Python chunk and install manually
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
+ENV PYENV_ROOT="$HOME/.pyenv"
+RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
+	&& git -C ~/.pyenv checkout ff93c58babd813066bf2d64d004a5cee33c0f27b \
+	&& pyenv install ${PYTHON_VERSION} \
+	&& pyenv global ${PYTHON_VERSION}
+
 # configure the interpreter
 RUN ["/usr/local/yugabyte/bin/post_install.sh"]
 
diff --git a/chunks/tool-yugabytedb/chunk.yaml b/chunks/tool-yugabytedb/chunk.yaml
diff --git a/dazzle.yaml b/dazzle.yaml
diff --git a/tests/lang-elixir.yaml b/tests/lang-elixir.yaml
diff --git a/tests/lang-java.yaml b/tests/lang-java.yaml
diff --git a/tests/lang-node.yaml b/tests/lang-node.yaml
diff --git a/tests/lang-ruby.yaml b/tests/lang-ruby.yaml
diff --git a/tests/tool-brew.yaml b/tests/tool-brew.yaml
diff --git a/tests/tool-mongodb.yaml b/tests/tool-mongodb.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM buildpack-deps:focal`
	`1`	`+FROM buildpack-deps:jammy`
`2`	`2`
`3`	`3`	`COPY install-packages upgrade-packages /usr/bin/`
`4`	`4`