From d7893e82aa43b253a25211b8758157d7bb94995e Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Thu, 13 Sep 2018 19:49:00 +0300 Subject: [PATCH] Remove OS variables --- Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e92f6d5..a50001a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,24 +14,18 @@ # limitations under the License. FROM ubuntu:trusty -#FROM debian:jessie LABEL maintainer="urpylka@gmail.com" ENV DEBIAN_FRONTEND noninteractive -ENV DIST=ubuntu -ENV RELEASE=trusty -#ENV DIST=debian -#ENV RELEASE=jessie - # Add Aptly repository RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys ED75B5A4483DA07C # Add Nginx repository -RUN echo "deb http://nginx.org/packages/$DIST/ $RELEASE nginx" > /etc/apt/sources.list.d/nginx.list -RUN echo "deb-src http://nginx.org/packages/$DIST/ $RELEASE nginx" >> /etc/apt/sources.list.d/nginx.list +RUN echo "deb http://nginx.org/packages/ubuntu/ trusty nginx" > /etc/apt/sources.list.d/nginx.list +RUN echo "deb-src http://nginx.org/packages/ubuntu/ trusty nginx" >> /etc/apt/sources.list.d/nginx.list RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 # Update APT repository and install packages