Optimized build process

trajano · trajano · commit 9b5555f32795 · 2017-05-24T16:58:19.000-04:00
Moved the logic of building the images into docker. Removed using any absolute paths on the build system (i.e. $(pwd) which does not work correctly on Windows) Added .gitattributes to ensure line endings for files being used in the Docker build containers are correct. Please compare with whitespace checks turned off. In order to support builds within the container bsdtar needs to be used rather than the regular tar due to docker/hub-feedback#727 The tar server was also removed in favor of copying from the container to the "im" folder and imported back using Dockerfile for the final image. The step where the files are tarred in install_ihs was removed and put into docker. This makes it easier to debug issues with tar
diff --git a/ilan/.gitattributes b/ilan/.gitattributes
@@ -0,0 +1,2 @@
+*.sh eol=lf
+*.csv eol=lf
diff --git a/ilan/Dockerfile b/ilan/Dockerfile
@@ -1,30 +1,52 @@
-############################################################################
-# (C) Copyright IBM Corporation 2015.                                      #
-#                                                                          #
-# Licensed under the Apache License, Version 2.0 (the "License");          #
-# you may not use this file except in compliance with the License.         #
-# You may obtain a copy of the License at                                  #
-#                                                                          #
-#      http://www.apache.org/licenses/LICENSE-2.0                          #
-#                                                                          #
-# Unless required by applicable law or agreed to in writing, software      #
-# distributed under the License is distributed on an "AS IS" BASIS,        #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
-# See the License for the specific language governing permissions and      #
-# limitations under the License.                                           #
-#                                                                          #
-############################################################################
+#!/bin/bash
+#
+###########################################################################
+# (C) Copyright IBM Corporation 2015, 2016.                               #
+#                                                                         #
+# Licensed under the Apache License, Version 2.0 (the "License");         #
+# you may not use this file except in compliance with the License.        #
+# You may obtain a copy of the License at                                 #
+#                                                                         #
+#      http://www.apache.org/licenses/LICENSE-2.0                         #
+#                                                                         #
+# Unless required by applicable law or agreed to in writing, software     #
+# distributed under the License is distributed on an "AS IS" BASIS,       #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.#
+# See the License for the specific language governing permissions and     #
+# limitations under the License.                                          #
+###########################################################################
 
-FROM ubuntu:16.04
+# This Dockerfile is meant to download the requisite software and tar them
+# up for the final DockerFile which will not have the IBM_ID and
+# IBM_PASSWORD saved
 
-MAINTAINER Kavitha Suresh Kumar <kavisuresh@in.ibm.com>
+FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y openssl wget
+RUN apt-get update && apt-get install --no-install-recommends -y unzip bsdtar && rm -rf /var/lib/apt/lists/*
+# BSD tar is need to prevent errors on Docker builds
+# see https://github.com/docker/hub-feedback/issues/727
+RUN export tar='bsdtar'
 
-ARG TAR_URL
+# Install IBM Installation Manager
+COPY im/agent.installer.linux.gtk.x86_64_*.zip /tmp/
+RUN unzip -qd /tmp/im /tmp/agent.installer.linux.gtk.x86_64_*.zip \
+  && /tmp/im/installc -acceptLicense -accessRights nonAdmin \
+    -installationDirectory "/opt/IBM/InstallationManager"  \
+    -dataLocation "/var/ibm/InstallationManager" -showProgress \
+  && rm -rf /tmp/agent.installer.linux.gtk.x86_65_*.zip /tmp/im
 
-COPY ihsstart.sh /work/
+ENV PATH /opt/IBM/InstallationManager/eclipse/tools:$PATH
+RUN mkdir /host
+RUN mkdir /target
+COPY install_ihs.sh /host
+COPY versions.csv /host
+COPY Dockerfile.template /host
+RUN chmod 700 /host/install_ihs.sh
 
-RUN wget -q -O - $TAR_URL | tar xz
-ENV PATH /opt/IBM/HTTPServer/bin:$PATH
-CMD ["/work/ihsstart.sh"]
+# requires envvars
+ARG VERSION
+ARG IBM_ID
+ARG IBM_PASSWORD
+RUN /host/install_ihs.sh
+RUN tar zcf /target/ihs${VERSION}.tar.gz /opt/IBM/HTTPServer /opt/IBM/WebSphere/Plugins /opt/IBM/WebSphere/Toolbox
+RUN sed s/@VERSION@/${VERSION}/ /host/Dockerfile.template > /target/Dockerfile.${VERSION}
diff --git a/ilan/Dockerfile.template b/ilan/Dockerfile.template
@@ -0,0 +1,34 @@
+############################################################################
+# (C) Copyright IBM Corporation 2015.                                      #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#      http://www.apache.org/licenses/LICENSE-2.0                          #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" BASIS,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+#                                                                          #
+############################################################################
+
+# This is a template Dockerfile which will have version of the tar expected
+# in the COPY command set during the previous docker build.
+
+FROM ubuntu:16.04
+
+MAINTAINER Kavitha Suresh Kumar <kavisuresh@in.ibm.com>
+
+RUN apt-get update && apt-get install --no-install-recommends -y unzip bsdtar && rm -rf /var/lib/apt/lists/*
+# BSD tar is need to prevent errors on Docker builds
+# see https://github.com/docker/hub-feedback/issues/727
+RUN export tar='bsdtar'
+
+COPY ihsstart.sh /work/
+COPY im/ihs@VERSION@.tar.gz /ihs.tar.gz
+RUN tar xzf /ihs.tar.gz && rm /ihs.tar.gz
+ENV PATH /opt/IBM/HTTPServer/bin:$PATH
+CMD ["/work/ihsstart.sh"]
diff --git a/ilan/build b/ilan/build
@@ -21,15 +21,13 @@ if [ $# != 3 ]; then
   exit 1
 fi
 
-docker build -t installation-manager im || exit $?
-docker run --rm -v $(pwd):/host installation-manager /host/install_ihs $1 $2 $3 || exit $?
+docker build -t installation-manager . --build-arg VERSION=$1 --build-arg IBM_ID=$2  --build-arg IBM_PASSWORD=$3|| exit $?
 
-docker run -d --name tar_server -v $(pwd)/ihs$1.tar.gz:/host/ihs$1.tar.gz -w /host python:2-slim python -m SimpleHTTPServer
-tar_server_ip=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' tar_server)
-tar_url="http://${tar_server_ip}:8000/ihs${1}.tar.gz"
+# copy the intermediate artifacts from /target
 
+docker run installation-manager cat /target/ihs$1.tar.gz > im/ihs$1.tar.gz
+docker run installation-manager cat /target/Dockerfile.$1 > im/Dockerfile.$1
 
 # Build image from hosted tar file
 echo "Building image"
-docker build -t ibm-http-server:$1 --build-arg TAR_URL=$tar_url . || exit $?
-docker rm -f tar_server
+docker build -t ibm-http-server:$1 -f im/DockerFile.$1 . || exit $?
diff --git a/ilan/im/.gitignore b/ilan/im/.gitignore
@@ -0,0 +1,3 @@
+*.zip
+*.tar.gz
+DockerFile.*
diff --git a/ilan/im/Dockerfile b/ilan/im/Dockerfile
diff --git a/ilan/im/NOTES.md b/ilan/im/NOTES.md
@@ -0,0 +1,3 @@
+This folder is where `agent.installer.linux.gtk.x85_64_*.zip` is expected to be stored.  The file is ignored for source control.
+
+In addition intermediate artifacts are stored here and will also be ignored by source control.
diff --git a/ilan/install_ihs.sh b/ilan/install_ihs.sh
@@ -16,9 +16,6 @@
 # limitations under the License.                                          #
 ###########################################################################
 
-VERSION=$1
-IBM_ID=$2
-IBM_PASSWORD=$3
 echo "Running build for versions: "$VERSION
 SECURE_STORAGE_FILE=/tmp/credentials
 
@@ -79,4 +76,3 @@ function install_version() {
 
 
 install_version
-tar -zcf /host/ihs${VERSION}.tar.gz /opt/IBM/HTTPServer /opt/IBM/WebSphere/Plugins /opt/IBM/WebSphere/Toolbox

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*.zip`
	`2`	`+*.tar.gz`
	`3`	`+DockerFile.*`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+This folder is where `agent.installer.linux.gtk.x85_64_*.zip` is expected to be stored. The file is ignored for source control.
	`2`	`+`
	`3`	`+In addition intermediate artifacts are stored here and will also be ignored by source control.`