From 1fcc0c739a81145c0a9d7e2260b34e335925346d Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 14 Feb 2017 16:03:32 +0100 Subject: Use proper leap-archive-keyring from debian --- docker/jessie/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/jessie/Dockerfile b/docker/jessie/Dockerfile index df7fa42..d63d771 100644 --- a/docker/jessie/Dockerfile +++ b/docker/jessie/Dockerfile @@ -3,23 +3,23 @@ FROM debian:jessie-backports MAINTAINER LEAP Encryption Access Project LABEL Description="Bare debian jessie baseimage with few customisation" Vendor="LEAP" Version="1.x" -RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ - # LEAP experimental archive signing key - apt-key adv --keyserver pool.sks-keyservers.net --recv-keys CE433F407BAB443AFEA196C1837C1AD5367429D9 && \ - # LEAP archive signing key - apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 1E453B2CE87BEE2F7DFE99661E34A1828E207901 -RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list +RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list && \ + sed -i 's/httpredir/deb/' /etc/apt/sources.list.d/backports.list + RUN apt-get update \ && apt-get -y dist-upgrade \ && apt-get install -y --no-install-recommends \ git \ - leap-keyring \ + leap-archive-keyring \ locales \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ + apt-get update + RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 -- cgit v1.2.3