diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index c37eee2a9ac5..ff71a41945c8 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -13,7 +13,7 @@ # 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 openjdk:8 +FROM bellsoft/liberica-openjdk-debian:8 ENTRYPOINT [] ARG CHROME_DRIVER_VERSION=2.35 @@ -33,6 +33,7 @@ RUN chmod +x /usr/local/bin/tini \ && apt-get install -y --no-install-recommends \ apt-transport-https \ lsb-release \ + gnupg2 \ && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ && echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ && echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ @@ -47,6 +48,7 @@ RUN chmod +x /usr/local/bin/tini \ cgroupfs-mount \ docker-ce \ docker-compose \ + git \ golang \ google-chrome-stable \ google-cloud-sdk \ diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile index 5bb41dac2fdd..912d6fb1aa8b 100644 --- a/ci/images/alpine-tools/Dockerfile +++ b/ci/images/alpine-tools/Dockerfile @@ -21,7 +21,7 @@ RUN apk --no-cache add \ musl-dev \ && go get -v github.com/masterzen/winrm-cli -FROM openjdk:8-jdk-alpine +FROM bellsoft/liberica-openjdk-alpine:8 COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh b/ci/images/google-geode-builder/scripts/cache_dependencies.sh index bca4da18909a..97c06c570280 100644 --- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh +++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh @@ -19,7 +19,7 @@ set -e WORK_DIR=$(mktemp -d) -export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 +export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 echo "JAVA_HOME is [${JAVA_HOME}]" if [ -z ${JAVA_HOME} ]; then diff --git a/ci/images/google-windows-geode-builder/packer.json b/ci/images/google-windows-geode-builder/packer.json index b86bfaee2b4b..c420a0bb358f 100644 --- a/ci/images/google-windows-geode-builder/packer.json +++ b/ci/images/google-windows-geode-builder/packer.json @@ -78,13 +78,13 @@ "$ErrorActionPreference = \"Stop\"", "Set-ExecutionPolicy Bypass -Scope Process -Force", "choco install -y git cygwin cyg-get adoptopenjdk11", - "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11", + "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11-adoptopenjdk", "choco install -y jdk8 -params 'installdir=c:\\\\java8tmp;source=false'", - "Move-Item \"C:\\java8tmp\" c:\\java8", + "Move-Item \"C:\\java8tmp\" c:\\java8-adoptopenjdk", "choco install -y git cygwin cyg-get liberica11jdk", - "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-11*\" c:\\java11-liberica", + "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-11*\" c:\\java11", "choco install -y liberica8jdk", - "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-8*\" c:\\java8-liberica", + "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-8*\" c:\\java8", "choco install -y openssh --version 7.7.2.1 /SSHServerFeature", "refreshenv", "$OldPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).Path", diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile index 5a92cfa661e0..eb58a04b2eb7 100644 --- a/ci/images/test-container/Dockerfile +++ b/ci/images/test-container/Dockerfile @@ -53,7 +53,7 @@ RUN apt-get update \ java-common \ bellsoft-java11 \ bellsoft-java8 \ - && update-java-alternatives -s java-1.8.0-openjdk-amd64 \ + && update-java-alternatives -s bellsoft-java8-amd64 \ && rm -rf /etc/alternatives \ && mv /etc/keep-alternatives /etc/alternatives \ && apt-get clean \ diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index ddbbc36e45ea..8b58c5c132ec 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelines/images/jinja.template.yml @@ -60,7 +60,7 @@ resources: - name: openjdk8-docker-image type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 - name: geode-benchmarks-image diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index b9b4c925f615..dd1052941114 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml @@ -25,7 +25,7 @@ benchmarks: options: '' max_in_flight: 4 - title: '_with_ssl' - flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/java-11-openjdk-amd64/' + flag: '-PwithSsl -PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64' options: '--tests=*GetBenchmark --tests=*PutBenchmark' max_in_flight: 1 - title: '_with_security_manager' diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh index ba898b26768b..685ec0c5954d 100755 --- a/ci/scripts/execute_build.sh +++ b/ci/scripts/execute_build.sh @@ -84,8 +84,8 @@ else DUNIT_PARALLEL_FORKS="" fi -SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" -#SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" if [ -v CALL_STACK_TIMEOUT ]; then ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "${SET_JAVA_HOME} && tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m" diff --git a/ci/scripts/execute_build_examples.sh b/ci/scripts/execute_build_examples.sh index 356e1c714e3d..b09f8e027f9f 100755 --- a/ci/scripts/execute_build_examples.sh +++ b/ci/scripts/execute_build_examples.sh @@ -46,8 +46,8 @@ INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)" GEODE_VERSION=$(jq -r .semver geode-passing-tokens/*.json) -SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" -#SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" GRADLE_COMMAND="./gradlew \ ${DEFAULT_GRADLE_TASK_OPTIONS} \ diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh index ba30963525bc..5e49cb0cf3c0 100755 --- a/ci/scripts/execute_publish.sh +++ b/ci/scripts/execute_publish.sh @@ -58,8 +58,8 @@ SSH_OPTIONS="-i ${SSHKEY_FILE} -o ConnectionAttempts=60 -o StrictHostKeyChecking INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)" -SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" -#SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" GRADLE_COMMAND="./gradlew \ ${DEFAULT_GRADLE_TASK_OPTIONS} \ diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh index eff676924af8..8a0db3b5f87b 100755 --- a/ci/scripts/execute_tests.sh +++ b/ci/scripts/execute_tests.sh @@ -76,10 +76,10 @@ case $ARTIFACT_SLUG in SEP=";" ;; *) - JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 - JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64 - # JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 - # JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64 + # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 + # JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64 + JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 + JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64 SEP="&&" ;; esac diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh index e6ae06c52644..1e1065a13d8b 100755 --- a/ci/scripts/rsync_code_down.sh +++ b/ci/scripts/rsync_code_down.sh @@ -47,8 +47,8 @@ case $ARTIFACT_SLUG in EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; ./gradlew --no-daemon combineReports'" ;; *) - JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 - # JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 + # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 + JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode && ./gradlew --no-daemon combineReports'" ;; esac diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile index eb9ef1e4f564..38bdf5a9f37a 100644 --- a/dev-tools/docker/base/Dockerfile +++ b/dev-tools/docker/base/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM openjdk:8 +FROM bellsoft/liberica-openjdk-debian:8 LABEL Vendor="Apache Geode" LABEL version=unstable diff --git a/dev-tools/release/deploy_rc_pipeline.sh b/dev-tools/release/deploy_rc_pipeline.sh index c8ab3f7adfeb..963456a9a7f8 100755 --- a/dev-tools/release/deploy_rc_pipeline.sh +++ b/dev-tools/release/deploy_rc_pipeline.sh @@ -94,7 +94,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -127,7 +127,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -162,7 +162,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -196,7 +196,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 11 inputs: - name: geode-examples @@ -222,7 +222,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode-examples @@ -253,7 +253,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode-native @@ -296,7 +296,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode-native @@ -344,7 +344,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -376,7 +376,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode-benchmarks @@ -413,7 +413,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -502,7 +502,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode @@ -549,7 +549,7 @@ jobs: image_resource: type: docker-image source: - repository: openjdk + repository: bellsoft/liberica-openjdk-debian tag: 8 inputs: - name: geode diff --git a/docker/Dockerfile b/docker/Dockerfile index 7da5b6d036f9..2d96eee5bd1f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM openjdk:8-jre-alpine -# FROM bellsoft/liberica-openjdk-alpine:8 +# FROM openjdk:8-jre-alpine +FROM bellsoft/liberica-openjdk-alpine:8 # runtime dependencies RUN apk add --no-cache \ diff --git a/docker/README.md b/docker/README.md index 5f58312b1ab6..bb6621b01c3f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,6 +1,6 @@ # Building the container image -The current Dockerfile is based on the [OpenJDK image](https://hub.docker.com/_/openjdk/) and includes the officially released Apache Geode binaries which are verified via GPG _and_ SHA256. +The current Dockerfile is based on the [Bellsoft Liberica OpenJDK image](https://hub.docker.com/r/bellsoft/liberica-openjdk-debian) and includes the officially released Apache Geode binaries which are verified via GPG _and_ SHA256. ``` docker build . diff --git a/geode-assembly/Dockerfile b/geode-assembly/Dockerfile index 77081bfb19c2..29e96a7bbd77 100644 --- a/geode-assembly/Dockerfile +++ b/geode-assembly/Dockerfile @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM openjdk:11 -# FROM bellsoft/liberica-openjdk-debian:11 +# FROM openjdk:11 +FROM bellsoft/liberica-openjdk-debian:11 COPY geode /geode ENV GEODE_HOME="/geode" ENV PATH="${GEODE_HOME}/bin:${PATH}" diff --git a/gradle/docker.gradle b/gradle/docker.gradle index 6ae216c3c5ca..a7d4b066f11b 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -30,7 +30,7 @@ * Additional properties that can be set are: * * dunitDockerImage - The docker image used for running parallel dunits. The - * default image is 'openjdk:8'. The image is required to + * default image is 'bellsoft/liberica-openjdk-debian:8'. The image is required to * have 'JAVA_HOME' set as an environment variable. * dunitParallelForks - The number of parallel containers that will be * launched. The default is 8.