Skip to content

Commit 62238c6

Browse files
authored
Add GitHub cli to Docker image (#118)
* add github cli * install github cli * update to jammy
1 parent 8bbbf03 commit 62238c6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

docker_images/ci-conantests/Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:jammy
22

33
LABEL maintainer="Conan.io <info@conan.io>"
44

@@ -12,7 +12,7 @@ RUN apt-get -qq update \
1212
# pyenv requires
1313
make build-essential libssl-dev zlib1g-dev libbz2-dev \
1414
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
15-
xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
15+
xz-utils tk-dev libffi-dev liblzma-dev python3-openssl git
1616

1717
RUN useradd -ms /bin/bash conan
1818
USER conan
@@ -40,9 +40,13 @@ RUN apt-get -qq update \
4040
software-properties-common
4141

4242
RUN curl -kfsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
43-
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable" \
43+
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable" \
44+
&& mkdir -p -m 755 /etc/apt/keyrings \
45+
&& curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/github-cli.gpg > /dev/null \
46+
&& chmod a+r /etc/apt/keyrings/github-cli.gpg \
47+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/github-cli.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
4448
&& apt-get update \
45-
&& apt-get install -y docker-ce docker-ce-cli containerd.io \
49+
&& apt-get install -y docker-ce docker-ce-cli containerd.io gh \
4650
&& rm -rf /var/lib/apt/lists/* \
4751
&& usermod -aG docker conan \
4852
&& systemctl enable docker \

0 commit comments

Comments
 (0)