This repository was archived by the owner on Feb 5, 2020. It is now read-only.
tests/ci: fix dockerfile and remove some layers #2600
Merged
Conversation
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
|
Can one of the admins verify this patch? |
mxinden
approved these changes
Dec 19, 2017
wking
added a commit
to wking/openshift-installer
that referenced
this pull request
Jul 25, 2018
1a49fbb (Move structure-check tools from Jenkinsfile to builder image, 2017-09-12, coreos/tectonic-installer#1889), added a: RUN go get github.com/s-urbaniak/terraform-examples to this Dockerfile. That package moved into the installer repository, but all we need for generation/testing is the terraform-examples binary, so a68555d (tests/ci: fix dockerfile and remove some layers, 2017-12-19, coreos/tectonic-installer#2600) removed the associated source with: RUN go get github.com/coreos/tectonic-installer/contrib/terraform-examples && \ rm -rf /go/src/github.com/coreos/tectonic-installer/ (i.e. "download github.com/coreos/tectonic-installer/contrib/terraform-examples, build terraform-examples, install it into $GOBIN, and remove the source"). d61abd4 (*: cleanup bazel rules, 2018-03-26, coreos/tectonic-installer#3137) removed the Makefile which had been calling terraform-examples, and 7c73c34 (remove terraform-examples from the tectonic-builder image, 2018-05-18, coreos/tectonic-installer#3239) removed the terraform-examples install from this Dockerfile. With the terraform-examples install removed, Go will no longer be downloading that source, so there's no longer any reason to remove it. This commit removes the unnecessary removal, which should make Dockerfile builds a bit faster and save an empty layer in the resulting images. More importantly, it avoids distracting future devs reading the Dockerfile source ;).
frobware
pushed a commit
to frobware/installer
that referenced
this pull request
Sep 17, 2018
1a49fbb (Move structure-check tools from Jenkinsfile to builder image, 2017-09-12, coreos/tectonic-installer#1889), added a: RUN go get github.com/s-urbaniak/terraform-examples to this Dockerfile. That package moved into the installer repository, but all we need for generation/testing is the terraform-examples binary, so a68555d (tests/ci: fix dockerfile and remove some layers, 2017-12-19, coreos/tectonic-installer#2600) removed the associated source with: RUN go get github.com/coreos/tectonic-installer/contrib/terraform-examples && \ rm -rf /go/src/github.com/coreos/tectonic-installer/ (i.e. "download github.com/coreos/tectonic-installer/contrib/terraform-examples, build terraform-examples, install it into $GOBIN, and remove the source"). d61abd4 (*: cleanup bazel rules, 2018-03-26, coreos/tectonic-installer#3137) removed the Makefile which had been calling terraform-examples, and 7c73c34 (remove terraform-examples from the tectonic-builder image, 2018-05-18, coreos/tectonic-installer#3239) removed the terraform-examples install from this Dockerfile. With the terraform-examples install removed, Go will no longer be downloading that source, so there's no longer any reason to remove it. This commit removes the unnecessary removal, which should make Dockerfile builds a bit faster and save an empty layer in the resulting images. More importantly, it avoids distracting future devs reading the Dockerfile source ;).
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
this fixes a change introduced in this PR: #2537 which add the tectonic-installer repo inside the image.
Also, remove some layers and bump terraform to 0.11.1