This repository was archived by the owner on Jun 2, 2023. It is now read-only.
Better builds + 9.0.0.3 + IHS shutdown fix #22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| *.sh eol=lf | ||
| *.csv eol=lf |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,52 @@ | ||
| ########################################################################### | ||
| # (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. # | ||
| ########################################################################### | ||
|
|
||
| # 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 | ||
|
|
||
| FROM ubuntu:16.04 | ||
|
|
||
| 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' | ||
|
|
||
| # 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 | ||
|
|
||
| ENV PATH /opt/IBM/InstallationManager/eclipse/tools:$PATH | ||
| RUN mkdir /host | ||
| RUN mkdir /target | ||
| COPY install_ihs.sh /host | ||
| COPY versions.csv /host | ||
| RUN chmod 700 /host/install_ihs.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 | ||
|
|
||
| # Build the version specific Docker file | ||
| COPY Dockerfile.template /host | ||
| RUN sed s/@VERSION@/${VERSION}/ /host/Dockerfile.template > /target/Dockerfile.${VERSION} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <[email protected]> | ||
|
|
||
| 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@[email protected] /ihs.tar.gz | ||
| RUN tar xzf /ihs.tar.gz && rm /ihs.tar.gz | ||
| ENV PATH /opt/IBM/HTTPServer/bin:$PATH | ||
| CMD ["/work/ihsstart.sh"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| *.zip | ||
| *.tar.gz | ||
| DockerFile.* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,9 +16,6 @@ | |
| # limitations under the License. # | ||
| ########################################################################### | ||
|
|
||
| echo "Running build for versions: "$VERSION | ||
| SECURE_STORAGE_FILE=/tmp/credentials | ||
|
|
||
|
|
@@ -79,4 +76,3 @@ function install_version() { | |
|
|
||
|
|
||
| install_version | ||
|
There was a problem hiding this comment. This was moved to Dockerfile There was a problem hiding this comment. @davidcurrie The installation-manager image is transient anyway it does not get pushed anywhere. But I did make most of these changes so I can do a build on Windows #20 |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This step means that you end up with the .tar.gz in a layer in the final image even though it is hidden by the layer above. That's why the current approach serves up the files so that they can be pulled in, unpacked and then deleted all as part of the same layer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm you're right I should have an
rmafter that step to get rid of the ihs.tar.gz file.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually that's because I don't use
--squashon thedocker buildstage https://docs.docker.com/engine/reference/commandline/build/#squash-an-images-layers---squash-experimental-only it's still experimental but the end users should only get the final image rather than the whole history no?