summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Smirnov <urpylka@gmail.com>2018-09-13 02:21:45 +0300
committerArtem Smirnov <urpylka@gmail.com>2018-09-14 00:41:10 +0300
commit53df87670a9aa499c0fb787e05118eb37226e396 (patch)
tree1e876fdd08ef032b23ebb1b556c8269564c47549
parent4e86e0803ab4acdb4f87b3b0ad99156c3adff275 (diff)
Remove double version of Dockerfile & backup code
-rw-r--r--Dockerfile6
-rw-r--r--Dockerfile.debian72
2 files changed, 6 insertions, 72 deletions
diff --git a/Dockerfile b/Dockerfile
index 7151571..ee267a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,16 @@
14# limitations under the License. 14# limitations under the License.
15 15
16FROM ubuntu:trusty 16FROM ubuntu:trusty
17#FROM debian:jessie
17 18
18MAINTAINER bryan@turbojets.net 19MAINTAINER bryan@turbojets.net
19 20
20ENV DEBIAN_FRONTEND noninteractive 21ENV DEBIAN_FRONTEND noninteractive
22
21ENV DIST=ubuntu 23ENV DIST=ubuntu
22ENV RELEASE=trusty 24ENV RELEASE=trusty
25#ENV DIST=debian
26#ENV RELEASE=jessie
23 27
24# Add Aptly repository 28# Add Aptly repository
25RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list 29RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
@@ -65,6 +69,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
65# Install scripts 69# Install scripts
66COPY assets/*.sh /opt/ 70COPY assets/*.sh /opt/
67COPY assets/update_mirror/update_mirror_ubuntu.sh /opt/update_mirror.sh 71COPY assets/update_mirror/update_mirror_ubuntu.sh /opt/update_mirror.sh
72#COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh
73
68 74
69# Bind mount location 75# Bind mount location
70VOLUME [ "/opt/aptly" ] 76VOLUME [ "/opt/aptly" ]
diff --git a/Dockerfile.debian b/Dockerfile.debian
deleted file mode 100644
index ea6a63b..0000000
--- a/Dockerfile.debian
+++ /dev/null
@@ -1,72 +0,0 @@
1# Copyright 2016 Bryan J. Hong
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15FROM debian:jessie
16
17MAINTAINER bryan@turbojets.net
18
19ENV DEBIAN_FRONTEND noninteractive
20ENV DIST=debian
21ENV RELEASE=jessie
22
23# Add Aptly repository
24RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
25RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
26
27# Add Nginx repository
28RUN echo "deb http://nginx.org/packages/$DIST/ $RELEASE nginx" > /etc/apt/sources.list.d/nginx.list
29RUN echo "deb-src http://nginx.org/packages/$DIST/ $RELEASE nginx" >> /etc/apt/sources.list.d/nginx.list
30RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
31
32# Update APT repository and install packages
33RUN apt-get -q update \
34 && apt-get -y install aptly \
35 bash-completion \
36 bzip2 \
37 gnupg \
38 gpgv \
39 graphviz \
40 supervisor \
41 nginx \
42 wget \
43 xz-utils
44
45# Install Aptly Configuration
46COPY assets/aptly.conf /etc/aptly.conf
47
48# Enable Aptly Bash completions
49RUN wget https://github.com/smira/aptly/raw/master/bash_completion.d/aptly \
50 -O /etc/bash_completion.d/aptly \
51 && echo "if ! shopt -oq posix; then\n\
52 if [ -f /usr/share/bash-completion/bash_completion ]; then\n\
53 . /usr/share/bash-completion/bash_completion\n\
54 elif [ -f /etc/bash_completion ]; then\n\
55 . /etc/bash_completion\n\
56 fi\n\
57fi" >> /etc/bash.bashrc
58
59# Install Nginx Config
60COPY assets/nginx.conf.sh /opt/nginx.conf.sh
61COPY assets/supervisord.nginx.conf /etc/supervisor/conf.d/nginx.conf
62RUN echo "daemon off;" >> /etc/nginx/nginx.conf
63
64# Install scripts
65COPY assets/*.sh /opt/
66COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh
67
68# Bind mount location
69VOLUME [ "/opt/aptly" ]
70
71# Execute Startup script when container starts
72ENTRYPOINT [ "/opt/startup.sh" ]