From 6dc4ee28abfeb3e01b77876350e703f74c196b20 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Thu, 13 Sep 2018 04:18:16 +0300 Subject: [PATCH] Add both scripts for update mirrors --- Dockerfile | 12 ++++-------- README.md | 4 ++-- assets/{update_mirror => }/update_mirror_debian.sh | 0 assets/{update_mirror => }/update_mirror_ubuntu.sh | 0 4 files changed, 6 insertions(+), 10 deletions(-) rename assets/{update_mirror => }/update_mirror_debian.sh (100%) rename assets/{update_mirror => }/update_mirror_ubuntu.sh (100%) diff --git a/Dockerfile b/Dockerfile index ee267a0..e92f6d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM ubuntu:trusty #FROM debian:jessie -MAINTAINER bryan@turbojets.net +LABEL maintainer="urpylka@gmail.com" ENV DEBIAN_FRONTEND noninteractive @@ -61,16 +61,12 @@ RUN wget https://github.com/aptly-dev/aptly/raw/master/completion.d/aptly \ 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_ubuntu.sh /opt/update_mirror.sh -#COPY assets/update_mirror/update_mirror_debian.sh /opt/update_mirror.sh +# Install Nginx Config +COPY assets/supervisord.nginx.conf /etc/supervisor/conf.d/nginx.conf +RUN echo "daemon off;" >> /etc/nginx/nginx.conf # Bind mount location VOLUME [ "/opt/aptly" ] diff --git a/README.md b/README.md index 6833f17..1417c01 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ docker stop aptly ### Create a mirror of Ubuntu's main repository 1. Attach to the container. How attach? [See this](##Configure-the-container). -2. Run `/opt/update_mirror.sh`. +2. Run `/opt/update_mirror_ubuntu.sh`. By default, this script will automate the creation of an Ubuntu 14.04 Trusty repository with the main and universe components, you can adjust the variables in the script to suit your needs. @@ -98,7 +98,7 @@ By default, this script will automate the creation of an Ubuntu 14.04 Trusty rep When the script completes, you should have a functional mirror that you can point a client to. -For create Debian's mirror use `/opt/debian_mirror.sh`. +For create Debian's mirror use `/opt/update_mirror_debian.sh`. ## Building the container diff --git a/assets/update_mirror/update_mirror_debian.sh b/assets/update_mirror_debian.sh similarity index 100% rename from assets/update_mirror/update_mirror_debian.sh rename to assets/update_mirror_debian.sh diff --git a/assets/update_mirror/update_mirror_ubuntu.sh b/assets/update_mirror_ubuntu.sh similarity index 100% rename from assets/update_mirror/update_mirror_ubuntu.sh rename to assets/update_mirror_ubuntu.sh