summaryrefslogtreecommitdiff
path: root/ubuntu/bionic
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/bionic')
-rw-r--r--ubuntu/bionic/Dockerfile13
1 files changed, 6 insertions, 7 deletions
diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile
index d5f8591..2877310 100644
--- a/ubuntu/bionic/Dockerfile
+++ b/ubuntu/bionic/Dockerfile
@@ -4,19 +4,18 @@ MAINTAINER Christian Pointner <equinox@helsinki.at>
LABEL at.helsinki.docker.os.distro=ubuntu at.helsinki.docker.os.release=bionic
RUN set -x \
- && echo 'deb http://apt.helsinki.at/ubuntu/ bionic main universe' > /etc/apt/sources.list \
- && echo 'deb http://apt.helsinki.at/ubuntu/ bionic-updates main universe' >> /etc/apt/sources.list \
- && echo 'deb http://apt.helsinki.at/ubuntu-security/ bionic-security main universe' >>/etc/apt/sources.list \
+ && echo 'deb http://apt.helsinki.at/ubuntu bionic main universe' > /etc/apt/sources.list \
+ && echo 'deb http://apt.helsinki.at/ubuntu bionic-updates main universe' >> /etc/apt/sources.list \
+ && echo 'deb http://apt.helsinki.at/ubuntu bionic-security main universe' >>/etc/apt/sources.list \
&& echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/02-norecommends \
&& apt-get update -q \
- && apt-get install -y -q tzdata gnupg2 locales \
+ && apt-get install -y -q tzdata locales \
&& apt-get upgrade -y -q \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-COPY common/helsinki_repo.pub /tmp
+COPY common/helsinki_repo.gpg /etc/apt/trusted.gpg.d/helsinki.gpg
RUN set -x \
- && echo 'deb http://build.helsinki.at/ bionic main' >>/etc/apt/sources.list.d/helsinki.list \
- && apt-key add /tmp/helsinki_repo.pub \
+ && echo 'deb http://build.helsinki.at bionic main' >>/etc/apt/sources.list.d/helsinki.list \
&& apt-get update -q \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*