From 6dc9e57dc2f188cd16ef345ac2d8870b9200ac0f Mon Sep 17 00:00:00 2001 From: Gabor Takacs <3968828+ghaabor@users.noreply.github.com> Date: Thu, 24 Sep 2020 06:43:21 +0000 Subject: [PATCH 1/3] weekly pinned update (#319) Co-authored-by: bitrise-infrabot --- Dockerfile-pinned | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-pinned b/Dockerfile-pinned index ed6b5f1..aa076f9 100644 --- a/Dockerfile-pinned +++ b/Dockerfile-pinned @@ -3,6 +3,6 @@ # is pre-cached on https://www.bitrise.io/ Linux/Android Virtual Machines. # Read more about how versions are handled in the README.md -FROM quay.io/bitriseio/android:alpha-v2020_09_17-02_22-b2251 +FROM quay.io/bitriseio/android:alpha-v2020_09_24-02_19-b2260 CMD bitrise --version From 6fa5128889947e4f30f2c9ffbe3155a10058660d Mon Sep 17 00:00:00 2001 From: Sandor Feher <43136024+fehersanyi-bitrise@users.noreply.github.com> Date: Wed, 30 Sep 2020 16:11:12 +0200 Subject: [PATCH 2/3] [IN-1842] Install Java 11 but keep Java 8 as default (#315) * [IN-1842] Install Java 11 but keep Java 8 as default * switch back to java8 after maven install * java version checks * remove java -version * JAVA_HOME set to default java8 * change not only java but javac version as well * nice up system report script output * changelog typo fix Co-authored-by: Laszlo Meszaros <64836569+lmesz-bitrise@users.noreply.github.com> --- CHANGELOG.md | 4 ++++ Dockerfile | 20 ++++++++++++++++---- system_report.sh | 9 +++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce8a8a5..af342f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## UPCOMING +## `v2020_09_30_1` + +* Java 11 preinstalled + ## `v2020_06_14_1` * Deprecated SDK tools replaced with Command line Tools: https://github.com/bitrise-docker/android/pull/300 diff --git a/Dockerfile b/Dockerfile index d266ceb..b284380 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,16 +6,24 @@ ENV ANDROID_HOME /opt/android-sdk-linux # ------------------------------------------------------ # --- Install required tools -RUN apt-get update -qq +RUN add-apt-repository ppa:openjdk-r/ppa +RUN dpkg --add-architecture i386 # Base (non android specific) tools # -> should be added to bitriseio/docker-bitrise-base # Dependencies to execute Android builds -RUN dpkg --add-architecture i386 RUN apt-get update -qq -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386 net-tools +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk openjdk-11-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386 net-tools + +# Keystore format has changed since JAVA 8 https://bugs.launchpad.net/ubuntu/+source/openjdk-9/+bug/1743139 +RUN mv /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.old \ + && keytool -importkeystore -destkeystore /etc/ssl/certs/java/cacerts -deststoretype jks -deststorepass changeit -srckeystore /etc/ssl/certs/java/cacerts.old -srcstoretype pkcs12 -srcstorepass changeit \ + && rm /etc/ssl/certs/java/cacerts.old +# Select JAVA 8 as default +RUN sudo update-java-alternatives --jre-headless --set java-1.8.0-openjdk-amd64 +RUN sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac # ------------------------------------------------------ # --- Download Android Command line Tools into $ANDROID_HOME @@ -39,7 +47,7 @@ ENV PATH ${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/to # Accept licenses before installing components, no need to echo y for each component # License is valid for all the standard components in versions installed from this file # Non-standard components: MIPS system images, preview versions, GDK (Google Glass) and Android Google TV require separate licenses, not accepted there -RUN yes | sdkmanager --licenses +RUN yes | sdkmanager --licenses RUN touch /root/.android/repositories.cfg @@ -125,6 +133,10 @@ RUN apt-get purge maven maven2 \ && apt-get -y install maven \ && mvn --version +# Reselect JAVA 8 as default +RUN sudo update-java-alternatives --jre-headless --set java-1.8.0-openjdk-amd64 +RUN sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 # ------------------------------------------------------ # --- Pre-install Ionic and Cordova CLIs diff --git a/system_report.sh b/system_report.sh index 14901f6..efcad8e 100644 --- a/system_report.sh +++ b/system_report.sh @@ -33,6 +33,15 @@ fi echo "========================================" echo +echo "=== Java ===============================" + +echo "* JAVA_HOME: $JAVA_HOME" +ver_line="$( java -version 2>&1 | head -n 1)" ; echo "* Java: $ver_line" +ver_line="$( javac -version 2>&1 | head -n 1)" ; echo "* Javac: $ver_line" + +echo "========================================" +echo + echo echo "=== Google Cloud SDK components ========" if [[ ! -z "$BITRISE_DOCKER_REV_NUMBER_ANDROID_NDK_LTS" ]] ; then From 3e09649661223c0348e1135b17ac97284c95231a Mon Sep 17 00:00:00 2001 From: Gabor Takacs <3968828+ghaabor@users.noreply.github.com> Date: Thu, 1 Oct 2020 08:39:48 +0200 Subject: [PATCH 3/3] weekly pinned update (#320) Co-authored-by: bitrise-infrabot --- Dockerfile-pinned | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-pinned b/Dockerfile-pinned index aa076f9..187ba7b 100644 --- a/Dockerfile-pinned +++ b/Dockerfile-pinned @@ -3,6 +3,6 @@ # is pre-cached on https://www.bitrise.io/ Linux/Android Virtual Machines. # Read more about how versions are handled in the README.md -FROM quay.io/bitriseio/android:alpha-v2020_09_24-02_19-b2260 +FROM quay.io/bitriseio/android:alpha-v2020_10_01-02_22-b2274 CMD bitrise --version