summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Smirnov <urpylka@gmail.com>2018-09-13 19:49:00 +0300
committerArtem Smirnov <urpylka@gmail.com>2018-09-14 00:41:46 +0300
commitd7893e82aa43b253a25211b8758157d7bb94995e (patch)
tree407e17f8033fdaddf54f7fa61f38f7007062e6eb
parent25cbeced9a2b3113a31deee913f63f35103b7aec (diff)
Remove OS variables
-rw-r--r--Dockerfile10
1 files changed, 2 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index e92f6d5..a50001a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,24 +14,18 @@
14# limitations under the License. 14# limitations under the License.
15 15
16FROM ubuntu:trusty 16FROM ubuntu:trusty
17#FROM debian:jessie
18 17
19LABEL maintainer="urpylka@gmail.com" 18LABEL maintainer="urpylka@gmail.com"
20 19
21ENV DEBIAN_FRONTEND noninteractive 20ENV DEBIAN_FRONTEND noninteractive
22 21
23ENV DIST=ubuntu
24ENV RELEASE=trusty
25#ENV DIST=debian
26#ENV RELEASE=jessie
27
28# Add Aptly repository 22# Add Aptly repository
29RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list 23RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
30RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys ED75B5A4483DA07C 24RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys ED75B5A4483DA07C
31 25
32# Add Nginx repository 26# Add Nginx repository
33RUN echo "deb http://nginx.org/packages/$DIST/ $RELEASE nginx" > /etc/apt/sources.list.d/nginx.list 27RUN echo "deb http://nginx.org/packages/ubuntu/ trusty nginx" > /etc/apt/sources.list.d/nginx.list
34RUN echo "deb-src http://nginx.org/packages/$DIST/ $RELEASE nginx" >> /etc/apt/sources.list.d/nginx.list 28RUN echo "deb-src http://nginx.org/packages/ubuntu/ trusty nginx" >> /etc/apt/sources.list.d/nginx.list
35RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 29RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
36 30
37# Update APT repository and install packages 31# Update APT repository and install packages