Skip to content

Commit c7d9c24

Browse files
committed
Use modern apt invocation
1 parent 9600a4f commit c7d9c24

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

docker-contributor/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
1414
DJ_DB_INSTALL_BARE=0
1515

1616
# Install required packages and clean up afterwards to make this image layer smaller
17-
RUN apt-get update \
18-
&& apt-get install --no-install-recommends --no-install-suggests -y \
17+
RUN apt update \
18+
&& apt install --no-install-recommends --no-install-suggests -y \
1919
dumb-init autoconf automake git acl \
2020
gcc g++ make zip unzip mariadb-client \
2121
nginx php7.4 php7.4-cli php7.4-fpm php7.4-zip \
@@ -50,8 +50,8 @@ RUN useradd -m domjudge \
5050
&& for id in `seq 0 4`; do useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-$id; done
5151

5252
# Install composer
53-
RUN apt-get update && \
54-
apt-get install --no-install-recommends --no-install-suggests -y ca-certificates \
53+
RUN apt update && \
54+
apt install --no-install-recommends --no-install-suggests -y ca-certificates \
5555
&& rm -rf /var/lib/apt/lists/* \
5656
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && php composer-setup.php \
5757
&& mv /composer.phar /usr/local/bin/composer

docker-gitlabci/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:20.04
22
ENV DEBIAN_FRONTEND=noninteractive
3-
RUN apt-get update && apt-get install -y \
3+
RUN apt update && apt install -y \
44
acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
55
libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
66
gcc g++ default-jre-headless default-jdk ghc fp-compiler libcgroup-dev \
@@ -33,8 +33,8 @@ RUN apt-get update && apt-get install -y \
3333
&& rm -rf /var/lib/apt/lists/*
3434

3535
# Install composer
36-
RUN apt-get update && \
37-
apt-get install --no-install-recommends --no-install-suggests -y ca-certificates \
36+
RUN apt update && \
37+
apt install --no-install-recommends --no-install-suggests -y ca-certificates \
3838
&& rm -rf /var/lib/apt/lists/* \
3939
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && php composer-setup.php \
4040
&& mv /composer.phar /usr/local/bin/composer

docker/domserver/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"
44
ENV DEBIAN_FRONTEND=noninteractive
55

66
# Install required packages for build of domserver
7-
RUN apt-get update \
8-
&& apt-get install --no-install-recommends --no-install-suggests -y \
7+
RUN apt update \
8+
&& apt install --no-install-recommends --no-install-suggests -y \
99
autoconf automake git \
1010
gcc g++ make acl zip unzip \
1111
php-cli php-zip \
@@ -52,8 +52,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
5252
DJ_DB_INSTALL_BARE=0
5353

5454
# Install required packages for running of domserver
55-
RUN apt-get update \
56-
&& apt-get install --no-install-recommends --no-install-suggests -y \
55+
RUN apt update \
56+
&& apt install --no-install-recommends --no-install-suggests -y \
5757
acl curl zip unzip supervisor mariadb-client apache2-utils \
5858
nginx php-cli php-fpm php-zip \
5959
php-gd php-curl php-mysql php-json php-intl \

docker/judgehost/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
1111
RUN_USER_UID_GID=62860
1212

1313
# Install required packages for running of judgehost
14-
RUN apt-get update \
15-
&& apt-get install --no-install-recommends --no-install-suggests -y \
14+
RUN apt update \
15+
&& apt install --no-install-recommends --no-install-suggests -y \
1616
dumb-init \
1717
acl zip unzip supervisor sudo procps libcgroup1 \
1818
php-cli php-zip php-gd php-curl php-mysql php-json \

docker/judgehost/Dockerfile.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ LABEL org.opencontainers.image.authors="DOMjudge team <[email protected]>"
44
ENV DEBIAN_FRONTEND=noninteractive
55

66
# Install required packages for build of judgehost
7-
RUN apt-get update \
8-
&& apt-get install --no-install-recommends --no-install-suggests -y \
7+
RUN apt update \
8+
&& apt install --no-install-recommends --no-install-suggests -y \
99
autoconf automake git \
1010
gcc g++ make zip unzip \
1111
php-cli php-zip lsb-release debootstrap \

docker/judgehost/Dockerfile.chroot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:20.04
22
ENV DEBIAN_FRONTEND=noninteractive
3-
RUN apt-get update && apt-get -y install \
3+
RUN apt update && apt -y install \
44
ca-certificates default-jre-headless pypy3 locales \
55
&& rm -rf /var/lib/apt/lists/*
66

0 commit comments

Comments
 (0)