Skip to content

Commit

Permalink
[docker] pin to v26.0.1 (#1339)
Browse files Browse the repository at this point in the history
Refer to gitpod-io/gitpod#19662 for background, this is a temporary fix

From a Gitpod workspace in this repo, test with:
```bash
./build-combo.sh base
```
  • Loading branch information
kylos101 committed Apr 29, 2024
1 parent eb8cbcb commit 189ab01
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

A curated, chronologically ordered list of notable changes in [Gitpod's default workspace images](https://hub.docker.com/u/gitpod).

## 2024-04-29

- Temporarily pin the version of Docker. Refer to [19662](https://github.com/gitpod-io/gitpod/issues/19662#issuecomment-2083388559) for more detail.

## 2024-04-10

- Deprecate `gitpod/workspace-ruby-3.0`
Expand Down
2 changes: 1 addition & 1 deletion chunks/tool-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor
&& 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 docker-ce-cli containerd.io docker-buildx-plugin
&& install-packages docker-ce=5:26.0.1-1~ubuntu.22.04~jammy docker-ce-cli=5:26.0.1-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) \
&& chmod +x /usr/local/bin/docker-compose && mkdir -p /usr/local/lib/docker/cli-plugins && \
Expand Down
2 changes: 1 addition & 1 deletion tests/lang-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
stderr.indexOf("17.0.") != -1
- desc: it should have a functioning java 17 installed
entrypoint: [env, GITPOD_REPO_ROOT=/workspace, bash, -ci]
command: [sdk default java 17.0.10.fx-zulu && java -version && mvn -v]
command: [sdk default java 17.0.11.fx-zulu && java -version && mvn -v]
assert:
- status == 0
- stderr.indexOf('openjdk version \"17.') != -1
Expand Down

0 comments on commit 189ab01

Please sign in to comment.