summaryrefslogtreecommitdiff
path: root/ci/containers/ubuntu-2004.Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'ci/containers/ubuntu-2004.Dockerfile')
-rw-r--r--ci/containers/ubuntu-2004.Dockerfile62
1 files changed, 31 insertions, 31 deletions
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 511d923..c8471ea 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -11,35 +11,35 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get install -y eatmydata && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y \
- ca-certificates \
- ccache \
- check \
- gcc \
- gettext \
- git \
- gtk-doc-tools \
- hwdata \
- libgirepository1.0-dev \
- libglib2.0-dev \
- libsoup2.4-dev \
- libxml2-dev \
- libxml2-utils \
- libxslt1-dev \
- locales \
- make \
- ninja-build \
- osinfo-db-tools \
- pkgconf \
- python3 \
- python3-lxml \
- python3-pip \
- python3-pytest \
- python3-requests \
- python3-setuptools \
- python3-wheel \
- valac \
- wget \
- xz-utils && \
+ ca-certificates \
+ ccache \
+ check \
+ gcc \
+ gettext \
+ git \
+ gtk-doc-tools \
+ hwdata \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ libsoup2.4-dev \
+ libxml2-dev \
+ libxml2-utils \
+ libxslt1-dev \
+ locales \
+ make \
+ ninja-build \
+ osinfo-db-tools \
+ pkgconf \
+ python3 \
+ python3-lxml \
+ python3-pip \
+ python3-pytest \
+ python3-requests \
+ python3-setuptools \
+ python3-wheel \
+ valac \
+ wget \
+ xz-utils && \
eatmydata apt-get autoremove -y && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@@ -49,10 +49,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN pip3 install meson==0.56.0
+RUN /usr/bin/pip3 install meson==0.56.0
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"