diff options
Diffstat (limited to 'debian/stretch')
| -rw-r--r-- | debian/stretch/Dockerfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/debian/stretch/Dockerfile b/debian/stretch/Dockerfile index 42ceca5..96640ee 100644 --- a/debian/stretch/Dockerfile +++ b/debian/stretch/Dockerfile @@ -4,19 +4,18 @@ MAINTAINER Christian Pointner <equinox@helsinki.at> LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=stretch RUN set -x \ - && echo 'deb http://apt.helsinki.at/debian/ stretch main' > /etc/apt/sources.list \ - && echo 'deb http://apt.helsinki.at/debian/ stretch-updates main' >> /etc/apt/sources.list \ - && echo 'deb http://apt.helsinki.at/debian-security/ stretch/updates main' >>/etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/debian stretch main' > /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/debian stretch-updates main' >> /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/security stretch/updates main' >>/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/ stretch main' >>/etc/apt/sources.list.d/helsinki.list \ - && apt-key add /tmp/helsinki_repo.pub \ + && echo 'deb http://build.helsinki.at stretch main' >>/etc/apt/sources.list.d/helsinki.list \ && apt-get update -q \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* |