diff options
| author | Christian Pointner <equinox@helsinki.at> | 2019-12-11 16:19:33 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2019-12-11 16:19:33 (GMT) |
| commit | 17277ef3f4ad6f43b0a32af73b3ab5e448248a89 (patch) | |
| tree | dbeaa359f92d5c4a8a2850b59ae6489f0734c8fb /ubuntu/bionic | |
| parent | 597c552e516a848b5393256c625bb638f97cc304 (diff) | |
added buster image and cleanup repo handling
Diffstat (limited to 'ubuntu/bionic')
| -rw-r--r-- | ubuntu/bionic/Dockerfile | 13 |
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/* |