Skip to content

Commit

Permalink
Merge pull request #188 from CircleCI-Public/ONPREM-878/update-docker…
Browse files Browse the repository at this point in the history
…-25-0-2

updating docker version
  • Loading branch information
soulchips authored Feb 5, 2024
2 parents 43eef0a + fbca2da commit a39eff1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions nomad-aws/template/nomad-startup.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
apt-get install -y "linux-image-$UNAME"
apt-get update
apt-get -y install docker-ce=5:20.10.14~3-0~ubuntu-focal \
docker-ce-cli=5:20.10.14~3-0~ubuntu-focal
apt-get -y install docker-ce=5:25.0.2-1~ubuntu.20.04~focal \
docker-ce-cli=5:25.0.2-1~ubuntu.20.04~focal

# force docker to use userns-remap to mitigate CVE 2019-5736
apt-get -y install jq
Expand Down
4 changes: 2 additions & 2 deletions nomad-gcp/templates/nomad-startup.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ system_update
add_docker_repo

install ntp
install docker-ce=5:20.10.14~3-0~ubuntu-focal
install docker-ce-cli=5:20.10.14~3-0~ubuntu-focal
install docker-ce=5:25.0.2-1~ubuntu.20.04~focal
install docker-ce-cli=5:25.0.2-1~ubuntu.20.04~focal
install jq

enabled_docker_userns
Expand Down

0 comments on commit a39eff1

Please sign in to comment.