diff --git a/Dockerfile b/Dockerfile index a7d160d..ec8fbf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,7 @@ ARG EMAIL_ADDRESS="youremail@example.com" ARG GPG_PASSWORD="PickAPassword" ARG HOSTNAME=localhost ARG MODE=packages +ARG PACKAGE_FILE=default ARG UBUNTU_RELEASE=xenial ARG UPSTREAM_URL="http://archive.ubuntu.com/ubuntu/" ARG COMPONENTS="main universe" @@ -65,12 +66,13 @@ ENV EMAIL_ADDRESS ${EMAIL_ADDRESS} ENV GPG_PASSWORD ${GPG_PASSWORD} ENV HOSTNAME ${HOSTNAME} ENV MODE ${MODE} +ENV PACKAGE_FILE=${PACKAGE_FILE} ENV UBUNTU_RELEASE=${UBUNTU_RELEASE} ENV UPSTREAM_URL=${UPSTREAM_URL} ENV COMPONENTS=${COMPONENTS} ENV REPOS=${REPOS} -COPY assets/packages /opt/packages +COPY assets/packages/* /opt/packages/ COPY assets/gpg/* /opt/aptly/ RUN /opt/startup.sh diff --git a/Vagrantfile b/Vagrantfile index 1eee671..bc05447 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -82,15 +82,15 @@ Vagrant.configure("2") do |config| node.vm.provision "file", source: ".", destination: "$HOME/docker-aptly" node.vm.provision :shell, inline: <<-SHELL - echo htop > /home/vagrant/docker-aptly/assets/packages - echo telnetd >> /home/vagrant/docker-aptly/assets/packages - echo openbsd-inetd >> /home/vagrant/docker-aptly/assets/packages - echo inet-superserver >> /home/vagrant/docker-aptly/assets/packages - echo 'mysql-client (>= 3.6)' >> /home/vagrant/docker-aptly/assets/packages + echo htop > /home/vagrant/docker-aptly/assets/packages/list + echo telnetd >> /home/vagrant/docker-aptly/assets/packages/list + echo openbsd-inetd >> /home/vagrant/docker-aptly/assets/packages/list + echo inet-superserver >> /home/vagrant/docker-aptly/assets/packages/list + echo 'mysql-client (>= 3.6)' >> /home/vagrant/docker-aptly/assets/packages/list SHELL node.vm.provision "docker" do |d| - d.build_image "/home/vagrant/docker-aptly -t aptly:test" + d.build_image "/home/vagrant/docker-aptly -t aptly:test --build-arg PACKAGE_FILE=list" d.run "aptly", args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'", image: "aptly:test" diff --git a/assets/packages b/assets/packages/default similarity index 100% rename from assets/packages rename to assets/packages/default diff --git a/assets/update_mirror_ubuntu.sh b/assets/update_mirror_ubuntu.sh index 336eb00..35787db 100755 --- a/assets/update_mirror_ubuntu.sh +++ b/assets/update_mirror_ubuntu.sh @@ -12,7 +12,11 @@ set -x # https://help.ubuntu.com/community/Repositories/CommandLine if [ "$MODE" = "packages" ]; then - FILTER_OPTS=(-filter="$(cat /opt/packages | paste -sd \| -)" -filter-with-deps) + if [ ! -f "/opt/packages/$PACKAGE_FILE" ]; then + echo "File with a package list is not found" + exit 1 + fi + FILTER_OPTS=(-filter="$(cat /opt/packages/$PACKAGE_FILE | paste -sd \| -)" -filter-with-deps) else FILTER_OPTS=() fi