From 0bc5b0c3a2769d385dae5c62dd43f139b0fb2d89 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Thu, 3 Aug 2017 21:31:50 -0500 Subject: [PATCH] Moved registry build later in Dockerfile template Moved the registry build and all COmanage specific environment varilables later in the Dockerfile template so that more layers can be reused when changing COmanage registry versions. --- .../Dockerfile.template | 16 +++++----- .../Dockerfile.template | 16 +++++----- .../Dockerfile.template | 29 +++++++++---------- comanage-registry/Dockerfile.template | 16 +++++----- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/comanage-registry-basic-auth/Dockerfile.template b/comanage-registry-basic-auth/Dockerfile.template index e0ae717..b62fad9 100644 --- a/comanage-registry-basic-auth/Dockerfile.template +++ b/comanage-registry-basic-auth/Dockerfile.template @@ -18,14 +18,6 @@ # limitations under the License. FROM php:7.0-apache -ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% -ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz - -LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION -LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL - -ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry - RUN apt-get update && apt-get install -y \ libldap-2.4-2 \ libldap2-dev \ @@ -50,6 +42,14 @@ RUN apt-get update && apt-get install -y \ libpq-dev \ && apt-get clean +ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% +ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz + +LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION +LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL + +ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry + COPY 000-comanage.conf /etc/apache2/sites-available/000-comanage.conf WORKDIR "$COMANAGE_REGISTRY_DIR" diff --git a/comanage-registry-mod-auth-openidc/Dockerfile.template b/comanage-registry-mod-auth-openidc/Dockerfile.template index 41f9737..86b678a 100644 --- a/comanage-registry-mod-auth-openidc/Dockerfile.template +++ b/comanage-registry-mod-auth-openidc/Dockerfile.template @@ -18,14 +18,6 @@ # limitations under the License. FROM php:7.0-apache -ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% -ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz - -LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION -LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL - -ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry - RUN apt-get update && apt-get install -y \ libldap-2.4-2 \ libldap2-dev \ @@ -89,6 +81,14 @@ RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.lis automake \ && apt-get clean +ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% +ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz + +LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION +LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL + +ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry + WORKDIR "$COMANAGE_REGISTRY_DIR" COPY 000-comanage.conf /etc/apache2/sites-available/000-comanage.conf diff --git a/comanage-registry-shibboleth-sp/Dockerfile.template b/comanage-registry-shibboleth-sp/Dockerfile.template index 744bfb5..e58dbb6 100644 --- a/comanage-registry-shibboleth-sp/Dockerfile.template +++ b/comanage-registry-shibboleth-sp/Dockerfile.template @@ -49,7 +49,7 @@ RUN wget -O log4shib.tar.gz "${LOG4SHIB_URL}" \ --prefix=/opt/shibboleth-sp \ --build=x86_64 \ && LD_FLAGS=-lpthread make \ - && make install \ + && make -j 2 install \ && cd .. \ && rm -r src @@ -61,7 +61,7 @@ RUN wget -O xerces.tar.gz "${XERCESC_URL}" \ && rm -f xerces.tar.gz \ && cd src \ && ./configure --prefix=/opt/shibboleth-sp \ - && make \ + && make -j 2 \ && make install \ && cd .. \ && rm -r src @@ -78,7 +78,7 @@ RUN wget -O xmlsecc.tar.gz "${XMLSECC_URL}" \ --with-openssl=/usr \ --disable-static \ --without-xalan \ - && make \ + && make -j 2 \ && make install \ && cd .. \ && rm -r src @@ -93,7 +93,7 @@ RUN wget -O xmltooling.tar.gz "${XMLTOOLING_URL}" \ && CXXFLAGS=-fPIC ./configure --prefix=/opt/shibboleth-sp \ --with-log4shib=/opt/shibboleth-sp \ -C \ - && make \ + && make -j 2 \ && make install \ && cd .. \ && rm -r src @@ -108,7 +108,7 @@ RUN wget -O opensamlc.tar.gz "${OPENSAMLC_URL}" \ && ./configure --prefix=/opt/shibboleth-sp \ --with-log4shib=/opt/shibboleth-sp \ -C \ - && make \ + && make -j 2 \ && make install \ && cd .. \ && rm -r src @@ -130,7 +130,7 @@ RUN wget -O shibboleth-sp.tar.gz "${SHIBBOLETH_SP_URL}" \ --with-apxs24=/usr/bin/apxs \ --disable-adfs \ --disable-obc \ - && make \ + && make -j 2 \ && make install \ && cd .. \ && rm -r src @@ -152,15 +152,6 @@ RUN /usr/sbin/useradd --system _shibd \ && apt-get install -y --no-install-recommends supervisor \ && mkdir -p /var/log/supervisor - -ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% -ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz - -LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION -LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL - -ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry - RUN apt-get update && apt-get install -y \ libldap-2.4-2 \ libldap2-dev \ @@ -193,6 +184,14 @@ RUN apt-get update && apt-get install -y \ make \ && apt-get clean +ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% +ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz + +LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION +LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL + +ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry + WORKDIR "$COMANAGE_REGISTRY_DIR" COPY 000-comanage.conf /etc/apache2/sites-available/000-comanage.conf diff --git a/comanage-registry/Dockerfile.template b/comanage-registry/Dockerfile.template index e0ae717..b62fad9 100644 --- a/comanage-registry/Dockerfile.template +++ b/comanage-registry/Dockerfile.template @@ -18,14 +18,6 @@ # limitations under the License. FROM php:7.0-apache -ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% -ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz - -LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION -LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL - -ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry - RUN apt-get update && apt-get install -y \ libldap-2.4-2 \ libldap2-dev \ @@ -50,6 +42,14 @@ RUN apt-get update && apt-get install -y \ libpq-dev \ && apt-get clean +ARG COMANAGE_REGISTRY_VERSION=%%COMANAGE_REGISTRY_VERSION%% +ARG COMANAGE_REGISTRY_SRC_URL=https://github.com/Internet2/comanage-registry/archive/$COMANAGE_REGISTRY_VERSION.tar.gz + +LABEL comanage_registry_version=$COMANAGE_REGISTRY_VERSION +LABEL comanage_registry_src_url=$COMANAGE_REGISTRY_SRC_URL + +ENV COMANAGE_REGISTRY_DIR /srv/comanage-registry + COPY 000-comanage.conf /etc/apache2/sites-available/000-comanage.conf WORKDIR "$COMANAGE_REGISTRY_DIR"