ORC-766: Generalize the docker scripts to handle build arguments.#658
Merged
dongjoon-hyun merged 2 commits intoapache:masterfrom Mar 22, 2021
Merged
ORC-766: Generalize the docker scripts to handle build arguments.#658dongjoon-hyun merged 2 commits intoapache:masterfrom
dongjoon-hyun merged 2 commits intoapache:masterfrom
Conversation
dongjoon-hyun
approved these changes
Mar 22, 2021
Member
There was a problem hiding this comment.
+1, LGTM. It's a nice generalization!
I tested this locally.
Building centos7
Building centos8
Building debian9
Building debian10
Building ubuntu16
Building ubuntu18
Building ubuntu20
Building centos8_jdk=11
Building ubuntu20_jdk=11
Building ubuntu20_jdk=11_cc=clang
Launching centos7 as 166755
Launching centos8 as 166756
Launching debian9 as 166757
Launching debian10 as 166758
Launching ubuntu16 as 166759
Launching ubuntu18 as 166760
Launching ubuntu20 as 166761
Launching centos8_jdk=11 as 166762
Launching ubuntu20_jdk=11 as 166764
Launching ubuntu20_jdk=11_cc=clang as 166767
$ docker run -it --rm orc-ubuntu20_jdk-11 java -version
openjdk version "11.0.10" 2021-01-19
OpenJDK Runtime Environment (build 11.0.10+9-Ubuntu-0ubuntu1.20.04)
OpenJDK 64-Bit Server VM (build 11.0.10+9-Ubuntu-0ubuntu1.20.04, mixed mode, sharing)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
This replaces the build matrix loops in the docker reinit.sh and run-all.sh scripts with expanding the
versions that we want to build in os-list.txt. The pattern for the build args is based on the name:
ubuntu20 builds ubuntu 20 with default parameters jdk=8 and cc=gcc
ubuntu20_jdk=11_cc=clang builds ubuntu 20 with jdk=11 and cc=clang
Those names are carried through to the docker tags with s/=/-/.
How was this patch tested?
I ran reinit.sh and run-all.sh and both ran fine. The docker images default to the proper c++ and java compilers.