Skip to content

Commit

Permalink
Use jammy as base image
Browse files Browse the repository at this point in the history
  • Loading branch information
sbidoul committed Aug 27, 2023
1 parent b26b992 commit 8f1184a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy

ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ A container image with useful tools to automate deployments.
- [htpasswd](https://httpd.apache.org/docs/current/programs/htpasswd.html)
- [unison](https://github.com/bcpierce00/unison)

It is based on Ubuntu 20.04, but don't rely on it and if you do, be
It is based on Ubuntu 22.04, but don't rely on it and if you do, be
extra sure to pin a tag.

It starts as user 0.
4 changes: 2 additions & 2 deletions install/get-salt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex
curl -fsSL -o /usr/share/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/py3/ubuntu/20.04/amd64/latest/salt-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg] https://repo.saltproject.io/py3/ubuntu/20.04/amd64/latest focal main" | tee /etc/apt/sources.list.d/salt.list
curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/latest jammy main" | tee /etc/apt/sources.list.d/salt.list
apt-get update -y
apt-get install -y salt-ssh
rm -fr /var/lib/apt/lists/*

0 comments on commit 8f1184a

Please sign in to comment.