airship/utils
Code Issues Proposed changes

Link to package file as a build arg

Browse Source
This commit is contained in:
Andrey Volkov 2018-10-24 07:10:04 -07:00
parent 1cf350e597
commit b573730642
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -55,6 +55,7 @@ ARG EMAIL_ADDRESS="youremail@example.com"
ARG GPG_PASSWORD="PickAPassword" ARG GPG_PASSWORD="PickAPassword"
ARG HOSTNAME=localhost ARG HOSTNAME=localhost
ARG MODE=packages ARG MODE=packages
ARG PACKAGE_FILE=default
ARG UBUNTU_RELEASE=xenial ARG UBUNTU_RELEASE=xenial
ARG UPSTREAM_URL="http://archive.ubuntu.com/ubuntu/" ARG UPSTREAM_URL="http://archive.ubuntu.com/ubuntu/"
ARG COMPONENTS="main universe" ARG COMPONENTS="main universe"
@ -65,12 +66,13 @@ ENV EMAIL_ADDRESS ${EMAIL_ADDRESS}
ENV GPG_PASSWORD ${GPG_PASSWORD} ENV GPG_PASSWORD ${GPG_PASSWORD}
ENV HOSTNAME ${HOSTNAME} ENV HOSTNAME ${HOSTNAME}
ENV MODE ${MODE} ENV MODE ${MODE}
ENV PACKAGE_FILE=${PACKAGE_FILE}
ENV UBUNTU_RELEASE=${UBUNTU_RELEASE} ENV UBUNTU_RELEASE=${UBUNTU_RELEASE}
ENV UPSTREAM_URL=${UPSTREAM_URL} ENV UPSTREAM_URL=${UPSTREAM_URL}
ENV COMPONENTS=${COMPONENTS} ENV COMPONENTS=${COMPONENTS}
ENV REPOS=${REPOS} ENV REPOS=${REPOS}
COPY assets/packages /opt/packages COPY assets/packages/* /opt/packages/
COPY assets/gpg/* /opt/aptly/ COPY assets/gpg/* /opt/aptly/
RUN /opt/startup.sh RUN /opt/startup.sh

12
Vagrantfile vendored
View File

@ -82,15 +82,15 @@ Vagrant.configure("2") do |config|
node.vm.provision "file", source: ".", destination: "$HOME/docker-aptly" node.vm.provision "file", source: ".", destination: "$HOME/docker-aptly"
node.vm.provision :shell, inline: <<-SHELL node.vm.provision :shell, inline: <<-SHELL
echo htop > /home/vagrant/docker-aptly/assets/packages echo htop > /home/vagrant/docker-aptly/assets/packages/list
echo telnetd >> /home/vagrant/docker-aptly/assets/packages echo telnetd >> /home/vagrant/docker-aptly/assets/packages/list
echo openbsd-inetd >> /home/vagrant/docker-aptly/assets/packages echo openbsd-inetd >> /home/vagrant/docker-aptly/assets/packages/list
echo inet-superserver >> /home/vagrant/docker-aptly/assets/packages echo inet-superserver >> /home/vagrant/docker-aptly/assets/packages/list
echo 'mysql-client (>= 3.6)' >> /home/vagrant/docker-aptly/assets/packages echo 'mysql-client (>= 3.6)' >> /home/vagrant/docker-aptly/assets/packages/list
SHELL SHELL
node.vm.provision "docker" do |d| 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", d.run "aptly",
args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'", args: "-p '8080:80' -v '/home/vagrant/docker-aptly/assets/nginx:/opt/nginx'",
image: "aptly:test" image: "aptly:test"

0
assets/packages → assets/packages/default
View File

6
assets/update_mirror_ubuntu.sh
View File

@ -12,7 +12,11 @@ set -x
# https://help.ubuntu.com/community/Repositories/CommandLine # https://help.ubuntu.com/community/Repositories/CommandLine
if [ "$MODE" = "packages" ]; then 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 else
FILTER_OPTS=() FILTER_OPTS=()
fi fi