Browse Source

Remove double version of Dockerfile & backup code

tags/v1.0
Artem Smirnov 10 months ago
parent
commit
53df87670a
2 changed files with 6 additions and 72 deletions
  1. 6
    0
      Dockerfile
  2. 0
    72
      Dockerfile.debian

+ 6
- 0
Dockerfile View File

@@ -14,12 +14,16 @@
14 14
 # limitations under the License.
15 15
 
16 16
 FROM ubuntu:trusty
17
+#FROM debian:jessie
17 18
 
18 19
 MAINTAINER bryan@turbojets.net
19 20
 
20 21
 ENV DEBIAN_FRONTEND noninteractive
22
+
21 23
 ENV DIST=ubuntu
22 24
 ENV RELEASE=trusty
25
+#ENV DIST=debian
26
+#ENV RELEASE=jessie
23 27
 
24 28
 # Add Aptly repository
25 29
 RUN 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 69
 # Install scripts
66 70
 COPY assets/*.sh /opt/
67 71
 COPY 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 75
 # Bind mount location
70 76
 VOLUME [ "/opt/aptly" ]

+ 0
- 72
Dockerfile.debian View File

@@ -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
-
15
-FROM debian:jessie
16
-
17
-MAINTAINER bryan@turbojets.net
18
-
19
-ENV DEBIAN_FRONTEND noninteractive
20
-ENV DIST=debian
21
-ENV RELEASE=jessie
22
-
23
-# Add Aptly repository
24
-RUN echo "deb http://repo.aptly.info/ squeeze main" > /etc/apt/sources.list.d/aptly.list
25
-RUN apt-key adv --keyserver keys.gnupg.net --recv-keys 9E3E53F19C7DE460
26
-
27
-# Add Nginx repository
28
-RUN echo "deb http://nginx.org/packages/$DIST/ $RELEASE nginx" > /etc/apt/sources.list.d/nginx.list
29
-RUN echo "deb-src http://nginx.org/packages/$DIST/ $RELEASE nginx" >> /etc/apt/sources.list.d/nginx.list
30
-RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
31
-
32
-# Update APT repository and install packages
33
-RUN 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
46
-COPY assets/aptly.conf /etc/aptly.conf
47
-
48
-# Enable Aptly Bash completions
49
-RUN 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\
57
-fi" >> /etc/bash.bashrc
58
-
59
-# Install Nginx Config
60
-COPY assets/nginx.conf.sh /opt/nginx.conf.sh
61
-COPY assets/supervisord.nginx.conf /etc/supervisor/conf.d/nginx.conf
62
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
63
-
64
-# Install scripts
65
-COPY assets/*.sh /opt/
66
-COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh
67
-
68
-# Bind mount location
69
-VOLUME [ "/opt/aptly" ]
70
-
71
-# Execute Startup script when container starts
72
-ENTRYPOINT [ "/opt/startup.sh" ]

Loading…
Cancel
Save