From edc39823cbb82f9834ac8968bbc664e1700385da Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 14:02:28 +0000 Subject: [PATCH 01/10] REPO-3057 Use Java image from quay.io as a base --- search-services/packaging/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 4a1b5ab00..22d5ad898 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -1,5 +1,5 @@ # Alfresco Solr Docker image -FROM openjdk:8u111-jdk-alpine +FROM quay.io/alfresco/alfresco-base-java MAINTAINER Gethin James, gethin.james@alfresco.com ARG solrUrl From 61f42dee482c6aec152d73c143e0f095dd28d1bd Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 14:51:36 +0000 Subject: [PATCH 02/10] REPO-3057 Use latest base Alfresco Java image available --- search-services/packaging/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 22d5ad898..efc702b0d 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -1,5 +1,5 @@ # Alfresco Solr Docker image -FROM quay.io/alfresco/alfresco-base-java +FROM quay.io/alfresco/alfresco-base-java:0.1.0 MAINTAINER Gethin James, gethin.james@alfresco.com ARG solrUrl From 41e998b55e69f9f7448b850b5187aec04f9aab15 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 15:16:48 +0000 Subject: [PATCH 03/10] REPO-3057 Use local resources to build the Docker image --- search-services/packaging/buildAndTest.sh | 5 ++++- search-services/packaging/pom.xml | 21 +++++++++++++++++++ .../packaging/src/docker/Dockerfile | 9 ++------ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 83db83f3b..938275d90 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -6,11 +6,14 @@ set -e # set current working directory to the directory of the script cd "$(dirname "$0")" +# Unzip the package +unzip alfresco-search-services-$bamboo_maven_version.zip -d docker-resources/alfresco-search-services + nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version" echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" -docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage src/docker +docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage docker-resources echo "Running tests" docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/solr ] || (echo "solr dir does not exist" && exit 1) diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 46caad408..f5222f3c1 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -220,6 +220,27 @@ + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/docker-resources + + + src/docker + true + + + + + + diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index efc702b0d..8c4499095 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -2,22 +2,17 @@ FROM quay.io/alfresco/alfresco-base-java:0.1.0 MAINTAINER Gethin James, gethin.james@alfresco.com -ARG solrUrl -ARG solrBranch -ARG solrVer -ENV SOLR_URL ${solrUrl:-https://nightlybuilds.alfresco.com/SearchServices/$solrBranch/LATEST/Distribution/alfresco-search-services-$solrVer.zip} -ENV SOLR_ZIP alfresco-search-services.zip ENV DIST_DIR /opt/alfresco-search-services ENV LANG C.UTF-8 +COPY alfresco-search-services $DIST_DIR + RUN addgroup solr && adduser -s /bin/bash -D -G solr solr RUN set -x \ && apk add --no-cache --virtual .fetch-deps \ ca-certificates \ vim unzip lsof \ bash openssl wget \ - && wget --no-check-certificate -O "$SOLR_ZIP" "$SOLR_URL" \ - && unzip "$SOLR_ZIP" -d /opt/ && rm "$SOLR_ZIP"\ && mkdir -p $DIST_DIR/data \ && mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \ && chown -R solr:solr $DIST_DIR \ From 61a86596e6637670209d0835c1396dd502c51b48 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 15:23:34 +0000 Subject: [PATCH 04/10] REPO-3057 Change installation commands to use yum --- search-services/packaging/src/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 8c4499095..792b76896 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -4,15 +4,14 @@ MAINTAINER Gethin James, gethin.james@alfresco.com ENV DIST_DIR /opt/alfresco-search-services ENV LANG C.UTF-8 +ENV OPENSSL_VERSION 1.0.2k-8.el7 COPY alfresco-search-services $DIST_DIR RUN addgroup solr && adduser -s /bin/bash -D -G solr solr RUN set -x \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - vim unzip lsof \ - bash openssl wget \ + && yum install -y ca-certificates openssl-$OPENSSL_VERSION \ + && yum clean all \ && mkdir -p $DIST_DIR/data \ && mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \ && chown -R solr:solr $DIST_DIR \ From fe0b287b52fbc20c18c9520883df192d7150fb1f Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 15:25:36 +0000 Subject: [PATCH 05/10] REPO-3057 Point build script to target folder --- search-services/packaging/buildAndTest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 938275d90..9ad26223d 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -7,13 +7,13 @@ set -e cd "$(dirname "$0")" # Unzip the package -unzip alfresco-search-services-$bamboo_maven_version.zip -d docker-resources/alfresco-search-services +unzip alfresco-search-services-$bamboo_maven_version.zip -d target/docker-resources/alfresco-search-services nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version" echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" -docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage docker-resources +docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage target/docker-resources echo "Running tests" docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/solr ] || (echo "solr dir does not exist" && exit 1) From dcc6ad34509855d6c9985dbecf021890f53ecfb8 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 15:43:54 +0000 Subject: [PATCH 06/10] REPO-3057 Correct zip extraction in build script --- search-services/packaging/buildAndTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 9ad26223d..9f2f1c3a1 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -7,7 +7,7 @@ set -e cd "$(dirname "$0")" # Unzip the package -unzip alfresco-search-services-$bamboo_maven_version.zip -d target/docker-resources/alfresco-search-services +unzip target/alfresco-search-services-$bamboo_maven_version.zip -d target/docker-resources nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version" From 1bb3a5954c7767afae6b653e79004aa8ae696b73 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 16:04:00 +0000 Subject: [PATCH 07/10] REPO-3057 Correct user creation in Docker image --- search-services/packaging/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 792b76896..9c99c3a3e 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -8,7 +8,7 @@ ENV OPENSSL_VERSION 1.0.2k-8.el7 COPY alfresco-search-services $DIST_DIR -RUN addgroup solr && adduser -s /bin/bash -D -G solr solr +RUN groupadd solr && useradd -s /bin/bash -g solr solr RUN set -x \ && yum install -y ca-certificates openssl-$OPENSSL_VERSION \ && yum clean all \ From 18020d173097cf215e246301b1629b241746b846 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 16:10:26 +0000 Subject: [PATCH 08/10] REPO-3057 Add lsof package to Docker image --- search-services/packaging/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 9c99c3a3e..135b8852f 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -10,7 +10,7 @@ COPY alfresco-search-services $DIST_DIR RUN groupadd solr && useradd -s /bin/bash -g solr solr RUN set -x \ - && yum install -y ca-certificates openssl-$OPENSSL_VERSION \ + && yum install -y lsof ca-certificates openssl-$OPENSSL_VERSION \ && yum clean all \ && mkdir -p $DIST_DIR/data \ && mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \ From 216aa4f6765334e9281f5362a05a26ed65fbf85f Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 16:12:04 +0000 Subject: [PATCH 09/10] REPO-3057 Remove unnecessary arguments in docker build command --- search-services/packaging/buildAndTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 9f2f1c3a1..0591592fa 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -13,7 +13,7 @@ nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version" echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" -docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage target/docker-resources +docker build -t $dockerImage target/docker-resources echo "Running tests" docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/solr ] || (echo "solr dir does not exist" && exit 1) From bef5bd8e1f0ace3205a35ef30be677c1b8b4be65 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 21 Nov 2017 16:15:14 +0000 Subject: [PATCH 10/10] REPO-3057 Configure pushing the image to quay.io --- search-services/packaging/buildAndTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 0591592fa..f509391d3 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -10,7 +10,7 @@ cd "$(dirname "$0")" unzip target/alfresco-search-services-$bamboo_maven_version.zip -d target/docker-resources nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` -dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version" +dockerImage="quay.io/alfresco/search-services:$bamboo_maven_version" echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" docker build -t $dockerImage target/docker-resources