Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chunks/lang-go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG GO_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
ENV TRIGGER_REBUILD=2
ENV GO_VERSION=${GO_VERSION}
ENV GOPATH=$HOME/go-packages
ENV GOROOT=$HOME/go
Expand Down
4 changes: 2 additions & 2 deletions chunks/lang-python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ RUN sudo install-packages \
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
# Install PYENV
&& git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
# v2.6.2
&& git -C ~/.pyenv checkout a71a378dacd210f5673550ff923715bf4d04324f \
# v2.6.7
&& git -C ~/.pyenv checkout 3dbdfdf39a4299261f1d6ae94d044036a89de930 \
&& pyenv install ${PYTHON_VERSION} \
&& pyenv global ${PYTHON_VERSION} \
&& for exec in global; do printf '%s\n' 'source "$HOME/.gp_pyenv.d/userbase.bash"' >> "$PYENV_ROOT/libexec/pyenv-$exec"; done \
Expand Down
6 changes: 3 additions & 3 deletions chunks/tool-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ FROM ${base}
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
ENV TRIGGER_REBUILD=2

# https://docs.docker.com/engine/install/ubuntu/
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
&& apt update \
&& install-packages docker-ce=5:27.3.1-1~ubuntu.22.04~jammy docker-ce-cli=5:27.3.1-1~ubuntu.22.04~jammy containerd.io docker-buildx-plugin
&& install-packages docker-ce=5:28.2.2-1~ubuntu.22.04~jammy docker-ce-cli=5:28.2.2-1~ubuntu.22.04~jammy containerd.io docker-buildx-plugin

RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-$(uname -m) \
RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-$(uname -m) \
&& chmod +x /usr/local/bin/docker-compose && mkdir -p /usr/local/lib/docker/cli-plugins && \
ln -s /usr/local/bin/docker-compose /usr/local/lib/docker/cli-plugins/docker-compose

Expand Down
2 changes: 1 addition & 1 deletion tests/tool-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
command: [docker-compose --version]
assert:
- status == 0
- stdout.indexOf("2.24.1") != -1
- stdout.indexOf("2.39.2") != -1
- desc: containerd should be installed
command: [containerd, config, dump]
assert:
Expand Down
Loading