From cf60cc4ede73fbeeb145906ed46dcc4eedb60d4e Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:30:02 -0400 Subject: [PATCH 01/16] Update docker file for rhel7 atomic and micro dnf instead of yum --- s2i-play/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index dfb3ad7bc..48920bdec 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -1,4 +1,4 @@ -FROM rhel7.4 +FROM rhel7-atomic MAINTAINER Andrew Block @@ -15,8 +15,9 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ - yum install -y $INSTALL_PKGS && \ - yum clean all && \ + microdnf install -y $INSTALL_PKGS && \ + microdnf update && \ + microdnf clean all && \ useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ -c "Default Application User" default && \ mkdir -p ${HOME} /opt/activator /opt/s2i/destination/src/ /deployments && \ From af8c0a934fae4039139dc7c3f0d87a5c666742f1 Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:36:05 -0400 Subject: [PATCH 02/16] update play s2i build yaml file for rhel atomic --- s2i-play/applier/templates/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 7480b3a23..36cb73d86 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -14,9 +14,9 @@ objects: metadata: labels: build: ${PLAY_BUILDER_NAME} - name: rhel7 + name: rhel7-atomic spec: - dockerImageRepository: registry.access.redhat.com/rhel7/rhel + dockerImageRepository: registry.access.redhat.com/rhel7-atomic/rhel - apiVersion: v1 kind: ImageStream metadata: @@ -51,7 +51,7 @@ objects: dockerFilePath: Dockerfile from: kind: ImageStreamTag - name: rhel7:7.4 + name: rhel7-atomic:7.5 type: Docker triggers: - type: ConfigChange @@ -94,7 +94,7 @@ parameters: displayName: Play builder source url name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true - value: https://github.com/redhat-cop/containers-quickstarts.git + value: https://github.com/dmhumph/containers-quickstarts.git - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From 0488f6801636219e33308efed6d5987590d6a61c Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:39:58 -0400 Subject: [PATCH 03/16] update play s2i build yaml template for atomic git branch --- s2i-play/applier/templates/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 36cb73d86..731036c8e 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -95,6 +95,7 @@ parameters: name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true value: https://github.com/dmhumph/containers-quickstarts.git + ref: "atomic" - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From 2a89c5857878ae26c1d16df3f369a893779d1e5a Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:42:50 -0400 Subject: [PATCH 04/16] update play s2i docker file to disable htb repo --- s2i-play/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index 48920bdec..cb672d39a 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -15,6 +15,7 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ + microdnf --disablerepo rhel-7-server-htb-rpms && \ microdnf install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ From dc8ba0ee1fdb39da29f240cf2f4ff6add2758fca Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:47:38 -0400 Subject: [PATCH 05/16] update play s2i build yaml to use registry.redhat.com/rhel7-atomic --- s2i-play/applier/templates/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 731036c8e..939b65d6a 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -16,7 +16,7 @@ objects: build: ${PLAY_BUILDER_NAME} name: rhel7-atomic spec: - dockerImageRepository: registry.access.redhat.com/rhel7-atomic/rhel + dockerImageRepository: registry.access.redhat.com/rhel7-atomic - apiVersion: v1 kind: ImageStream metadata: From 8f60f5efb6d9cd4f5e62ed41570e48fff4cb50cb Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:50:47 -0400 Subject: [PATCH 06/16] upate play s2i build ref to atomic branch in git --- s2i-play/applier/templates/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 939b65d6a..63eab506a 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -95,7 +95,7 @@ parameters: name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true value: https://github.com/dmhumph/containers-quickstarts.git - ref: "atomic" + ref: atomic - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From 348c83b2c85306ad777350af4ced84680546bf3f Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 09:59:50 -0400 Subject: [PATCH 07/16] update play s2i build yaml for atomic repo to be used in the git project url --- s2i-play/applier/templates/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 63eab506a..dbb69f6a6 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -94,8 +94,7 @@ parameters: displayName: Play builder source url name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true - value: https://github.com/dmhumph/containers-quickstarts.git - ref: atomic + value: https://github.com/dmhumph/containers-quickstarts.git#atomic - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From adbaf353e2d5f57925bb8eb0125582442e8d55d0 Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 10:33:11 -0400 Subject: [PATCH 08/16] update dockerfile and build yaml for play s2i --- s2i-play/Dockerfile | 2 +- s2i-play/applier/templates/build.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index cb672d39a..51f81a1cf 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -15,7 +15,7 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ - microdnf --disablerepo rhel-7-server-htb-rpms && \ + microdnf --disablerepo=rhel-7-server-htb-rpms && \ microdnf install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index dbb69f6a6..63eab506a 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -94,7 +94,8 @@ parameters: displayName: Play builder source url name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true - value: https://github.com/dmhumph/containers-quickstarts.git#atomic + value: https://github.com/dmhumph/containers-quickstarts.git + ref: atomic - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From 07c77d40b625839673a0f5ce6186391be40fd99c Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 10:43:03 -0400 Subject: [PATCH 09/16] update dockerfile for play s2i --- s2i-play/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index 51f81a1cf..48920bdec 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -15,7 +15,6 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ - microdnf --disablerepo=rhel-7-server-htb-rpms && \ microdnf install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ From c4b2a8a9a1238eea60faf58e809db9e230adeb8a Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 10:46:18 -0400 Subject: [PATCH 10/16] update dockerfile for play s2i --- s2i-play/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index 48920bdec..ed3b3ad3f 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -15,7 +15,7 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ - microdnf install -y $INSTALL_PKGS && \ + microdnf --enablerepo=rhel-7-server-rpms install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ From c366a1d6d116d66f21c1db296c47854cac819056 Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 10:52:39 -0400 Subject: [PATCH 11/16] update docker file for play s2i --- s2i-play/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index ed3b3ad3f..e142f01a0 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -18,7 +18,7 @@ RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk- microdnf --enablerepo=rhel-7-server-rpms install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ - useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ + adduser -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ -c "Default Application User" default && \ mkdir -p ${HOME} /opt/activator /opt/s2i/destination/src/ /deployments && \ chown -R 1001:0 /opt/app-root /opt/activator /opt/s2i/destination/src/ /deployments && \ From b45d2d5b8e6509d4e997dc8bc1f35b35b921c370 Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 11:02:04 -0400 Subject: [PATCH 12/16] update dockerfile to install shadow-utils for useradd for the play s2i --- s2i-play/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index e142f01a0..36d54e29a 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -14,11 +14,11 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i -RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ +RUN INSTALL_PKGS="tar unzip bc which lsof shadow-utils java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ microdnf --enablerepo=rhel-7-server-rpms install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ - adduser -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ + useradd -u 1001 -r -g 0 -d ${HOME} -s /sbin/nologin \ -c "Default Application User" default && \ mkdir -p ${HOME} /opt/activator /opt/s2i/destination/src/ /deployments && \ chown -R 1001:0 /opt/app-root /opt/activator /opt/s2i/destination/src/ /deployments && \ From dd52d81e30ace9b13205fa80759a3272eb4dff0e Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 11:07:41 -0400 Subject: [PATCH 13/16] update docker file for play s2i to point to atomic branch --- s2i-play/applier/templates/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 63eab506a..ac23b6673 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -95,12 +95,11 @@ parameters: name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true value: https://github.com/dmhumph/containers-quickstarts.git - ref: atomic - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF required: false - value: master + value: atomic - description: Path within Git project to build containing the Play Framework builder; empty for root project directory. displayName: Play builder context directory. From 1258c37754a9138df444cb3a798d2f6a8f7e4fc3 Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Fri, 3 Aug 2018 11:55:47 -0400 Subject: [PATCH 14/16] update docker file to include gzip for play s2i atomic branch --- s2i-play/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/Dockerfile b/s2i-play/Dockerfile index 36d54e29a..6d853804a 100644 --- a/s2i-play/Dockerfile +++ b/s2i-play/Dockerfile @@ -14,7 +14,7 @@ ENV ACTIVATOR_VERSION=1.3.10 \ COPY s2i /usr/libexec/s2i -RUN INSTALL_PKGS="tar unzip bc which lsof shadow-utils java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ +RUN INSTALL_PKGS="tar unzip bc gzip which lsof shadow-utils java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \ microdnf --enablerepo=rhel-7-server-rpms install -y $INSTALL_PKGS && \ microdnf update && \ microdnf clean all && \ From bc545491d304fe9e081075caa7f49927d412970e Mon Sep 17 00:00:00 2001 From: Dustin Humphries Date: Mon, 6 Aug 2018 10:13:41 -0400 Subject: [PATCH 15/16] change git repo back to redhat-cop for PR --- s2i-play/applier/templates/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index ac23b6673..1656d93e3 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -94,7 +94,7 @@ parameters: displayName: Play builder source url name: PLAY_BUILDER_SOURCE_REPOSITORY_URL required: true - value: https://github.com/dmhumph/containers-quickstarts.git + value: https://github.com/redhat-cop/containers-quickstarts.git - description: Play Framework builder source branch/tag reference. displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF From 73983907090ae7081b3eb599f6aca6ee4e64f99a Mon Sep 17 00:00:00 2001 From: Dusty Humphries Date: Thu, 16 Aug 2018 08:05:56 -0400 Subject: [PATCH 16/16] Change source branch ref back to master --- s2i-play/applier/templates/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2i-play/applier/templates/build.yml b/s2i-play/applier/templates/build.yml index 1656d93e3..64ac486ba 100644 --- a/s2i-play/applier/templates/build.yml +++ b/s2i-play/applier/templates/build.yml @@ -99,7 +99,7 @@ parameters: displayName: Play builder source branch/tag reference. name: PLAY_BUILDER_SOURCE_REPOSITORY_REF required: false - value: atomic + value: master - description: Path within Git project to build containing the Play Framework builder; empty for root project directory. displayName: Play builder context directory.