Remove double version of Dockerfile & backup code

This commit is contained in:
Artem Smirnov 2018-09-13 02:21:45 +03:00
parent 4e86e0803a
commit 53df87670a
2 changed files with 6 additions and 72 deletions

View File

@ -14,12 +14,16 @@
# limitations under the License.
FROM ubuntu:trusty
#FROM debian:jessie
MAINTAINER bryan@turbojets.net
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
@ -65,6 +69,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
# Install scripts
COPY assets/*.sh /opt/
COPY assets/update_mirror/update_mirror_ubuntu.sh /opt/update_mirror.sh
#COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh
# Bind mount location
VOLUME [ "/opt/aptly" ]

View File

@ -1,72 +0,0 @@
# Copyright 2016 Bryan J. Hong
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:jessie
MAINTAINER bryan@turbojets.net
ENV DEBIAN_FRONTEND noninteractive
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 keys.gnupg.net --recv-keys 9E3E53F19C7DE460
# 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 apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
# Update APT repository and install packages
RUN apt-get -q update \
&& apt-get -y install aptly \
bash-completion \
bzip2 \
gnupg \
gpgv \
graphviz \
supervisor \
nginx \
wget \
xz-utils
# Install Aptly Configuration
COPY assets/aptly.conf /etc/aptly.conf
# Enable Aptly Bash completions
RUN wget https://github.com/smira/aptly/raw/master/bash_completion.d/aptly \
-O /etc/bash_completion.d/aptly \
&& echo "if ! shopt -oq posix; then\n\
if [ -f /usr/share/bash-completion/bash_completion ]; then\n\
. /usr/share/bash-completion/bash_completion\n\
elif [ -f /etc/bash_completion ]; then\n\
. /etc/bash_completion\n\
fi\n\
fi" >> /etc/bash.bashrc
# Install Nginx Config
COPY assets/nginx.conf.sh /opt/nginx.conf.sh
COPY assets/supervisord.nginx.conf /etc/supervisor/conf.d/nginx.conf
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
# Install scripts
COPY assets/*.sh /opt/
COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh
# Bind mount location
VOLUME [ "/opt/aptly" ]
# Execute Startup script when container starts
ENTRYPOINT [ "/opt/startup.sh" ]