Skip to content

Commit d266cae

Browse files
committed
Upgrade distro and versions
Distro to Jammy GCC 10.5.0 CMAKE 3.28.1 CONAN 1.62.0
1 parent 8136b85 commit d266cae

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

Dockerfile

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

33
ENV GCC_VERSION=10 \
4-
CONAN_VERSION="1.44.1" \
5-
CONAN_PKG_VERSION="0.37.0" \
6-
CMAKE_VERSION_FULL="3.22.2" \
4+
CONAN_VERSION="1.62.0" \
5+
CONAN_PKG_VERSION="0.39.1" \
6+
CMAKE_VERSION_FULL="3.28.1" \
77
CC=/usr/bin/gcc \
88
CXX=/usr/bin/g++ \
99
DEBIAN_FRONTEND=noninteractive
1010

1111
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1212

1313
# hadolint ignore=DL3008
14-
RUN apt-get -qq update && apt-get -qq upgrade -y \
15-
&& apt-get -qq install -y --no-install-recommends --no-install-suggests \
16-
sudo \
17-
binutils \
18-
wget \
19-
git \
20-
libc6-dev \
21-
g++-${GCC_VERSION} \
22-
libgmp-dev \
23-
libmpfr-dev \
24-
libmpc-dev \
25-
nasm \
26-
dh-autoreconf \
27-
ninja-build \
28-
libffi-dev \
29-
libssl-dev \
30-
pkg-config \
31-
subversion \
32-
zlib1g-dev \
33-
libbz2-dev \
34-
libsqlite3-dev \
35-
libreadline-dev \
36-
xz-utils \
37-
curl \
38-
libncurses5-dev \
39-
libncursesw5-dev \
40-
liblzma-dev \
41-
ca-certificates \
42-
autoconf-archive \
43-
python \
44-
pip \
14+
RUN apt-get -qq update && apt-get -qq upgrade -y && \
15+
apt-get -qq install -y --no-install-recommends --no-install-suggests \
16+
sudo \
17+
binutils \
18+
wget \
19+
git \
20+
libc6-dev \
21+
g++-${GCC_VERSION} \
22+
libgmp-dev \
23+
libmpfr-dev \
24+
libmpc-dev \
25+
nasm \
26+
dh-autoreconf \
27+
ninja-build \
28+
libffi-dev \
29+
libssl-dev \
30+
pkg-config \
31+
subversion \
32+
zlib1g-dev \
33+
libbz2-dev \
34+
libsqlite3-dev \
35+
libreadline-dev \
36+
xz-utils \
37+
curl \
38+
libncurses5-dev \
39+
libncursesw5-dev \
40+
liblzma-dev \
41+
ca-certificates \
42+
autoconf-archive \
43+
python3 \
44+
python3-pip \
4545
&& rm -rf /var/lib/apt/lists/* \
4646
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 100 \
4747
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-${GCC_VERSION} 100 \
@@ -53,5 +53,5 @@ RUN apt-get -qq update && apt-get -qq upgrade -y \
5353
&& chmod +x /usr/local/bin/jfrog \
5454
&& pip install -q --upgrade --no-cache-dir pip==22.0.2 \
5555
&& pip install -q --no-cache-dir conan==${CONAN_VERSION} conan-package-tools==${CONAN_PKG_VERSION} cmake==${CMAKE_VERSION_FULL}
56-
56+
5757
COPY default-profile /root/.conan/profiles/default

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ A docker container for building C++ projects with GCC10 that targets amd64. This
66

77
| Package | Version |
88
| ------- | ----------------------------------------- |
9-
| GCC | gcc (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 |
10-
| CMake | cmake version 3.22.2 |
11-
| Conan | Conan version 1.44.1 |
9+
| GCC | gcc (Ubuntu 10.5.0-1ubuntu1~22.04) 10.5.0 |
10+
| CMake | cmake version 3.28.1 |
11+
| Conan | Conan version 1.62.0 |
1212

1313
## How to Use
1414

0 commit comments

Comments
 (0)