openstack/openstack-helm-images
Code Issues Proposed changes

Fix build script arg and re-order Dockerfile

Browse Source 
Simplified apt key import for minimirror

This also moves around the commands in the Dockerfiles so caching makes
a bit more sense, such as only copying over a script right before it
is used so previous steps don't need to be re-run when developing
locally.

Change-Id: I1271e218303ce7d35f4c67e256c4409e38d231e5
This commit is contained in:
Egorov, Stanislav
2019-11-22 09:20:52 -08:00
parent 3bf3cd9e33
commit 489a3e1678
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mini-mirror/Dockerfile.ubuntu_bionic
View File

@@ -19,17 +19,18 @@ ARG MIRROR_SOURCE_DIR=sources
ARG RELEASE_SIGN_KEY_PATH=etc ARG RELEASE_SIGN_KEY_PATH=etc
ARG RELEASE_SIGN_KEY_PASSPHRASE ARG RELEASE_SIGN_KEY_PASSPHRASE
COPY "${APTLY_CONFIG_PATH}" /etc/aptly.conf
COPY "${MIRROR_SOURCE_DIR}" /opt/sources
COPY "${RELEASE_SIGN_KEY_PATH}" /opt/release.gpg
COPY tools/install_aptly.sh /opt/install_aptly.sh
COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh
RUN apt-get update RUN apt-get update
RUN apt-get install -y gnupg wget RUN apt-get install -y gnupg wget
COPY "${APTLY_CONFIG_PATH}" /etc/aptly.conf
COPY tools/install_aptly.sh /opt/install_aptly.sh
RUN /opt/install_aptly.sh RUN /opt/install_aptly.sh
COPY "${MIRROR_SOURCE_DIR}" /opt/sources
COPY "${RELEASE_SIGN_KEY_PATH}" /opt/release.gpg
COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh
RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}" RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}"
FROM nginx FROM nginx

15
mini-mirror/Dockerfile.ubuntu_xenial
View File

@@ -19,17 +19,18 @@ ARG MIRROR_SOURCE_DIR=sources
ARG RELEASE_SIGN_KEY_PATH=etc ARG RELEASE_SIGN_KEY_PATH=etc
ARG RELEASE_SIGN_KEY_PASSPHRASE ARG RELEASE_SIGN_KEY_PASSPHRASE
COPY "${APTLY_CONFIG_PATH}" /etc/aptly.conf
COPY "${MIRROR_SOURCE_DIR}" /opt/sources
COPY "${RELEASE_SIGN_KEY_PATH}" /opt/release.gpg
COPY tools/install_aptly.sh /opt/install_aptly.sh
COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh
RUN apt-get update RUN apt-get update
RUN apt-get install -y wget RUN apt-get install -y wget
COPY "${APTLY_CONFIG_PATH}" /etc/aptly.conf
COPY tools/install_aptly.sh /opt/install_aptly.sh
RUN /opt/install_aptly.sh RUN /opt/install_aptly.sh
COPY "${MIRROR_SOURCE_DIR}" /opt/sources
COPY "${RELEASE_SIGN_KEY_PATH}" /opt/release.gpg
COPY tools/publish_snapshots.sh /opt/publish_snapshots.sh
RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}" RUN /opt/publish_snapshots.sh "${RELEASE_SIGN_KEY_PASSPHRASE}"
FROM nginx FROM nginx

3
mini-mirror/tools/install_aptly.sh
View File

@@ -20,8 +20,7 @@ tee /etc/apt/sources.list.d/aptly.list << EOF
deb http://repo.aptly.info/ squeeze main deb http://repo.aptly.info/ squeeze main
EOF EOF
apt-key adv --keyserver pool.sks-keyservers.net \ wget -qO - https://www.aptly.info/pubkey.txt | apt-key add -
--recv-keys ED75B5A4483DA07C
apt-get update apt-get update
apt-get install -y --no-install-recommends aptly apt-get install -y --no-install-recommends aptly