From 93a27ed0fcd9490b85157178c9825aa5e93cadb5 Mon Sep 17 00:00:00 2001 From: Pavlo Vykhrov Date: Wed, 14 May 2025 14:45:45 +0300 Subject: [PATCH 1/3] Update versions android 33-35 and remove unmaintained tags, change ubuntu version on jammy --- .github/workflows/release-image.yml | 2 +- .gitignore | 3 + 33-emulator/Dockerfile | 83 +++++++++------- 33-jdk17/Dockerfile | 75 ++++++++------ 33-ndk/Dockerfile | 75 ++++++++------ 33-stf-client/Dockerfile | 91 +++++++++-------- 33/Dockerfile | 75 ++++++++------ 34-emulator/Dockerfile | 83 +++++++++------- 34-jdk11/Dockerfile | 75 ++++++++------ 34-ndk/Dockerfile | 75 ++++++++------ 34-stf-client/Dockerfile | 91 +++++++++-------- 34/Dockerfile | 75 ++++++++------ {32-emulator => 35-emulator}/Dockerfile | 89 ++++++++++------- .../tools-emulator/android-start-emulator | 0 .../tools-emulator/android-wait-for-emulator | 0 {32-emulator => 35-emulator}/tools/adb-all | 0 .../tools/license_accepter | 0 {32 => 35-jdk11}/Dockerfile | 81 ++++++++------- {32-jdk17 => 35-jdk11}/tools/adb-all | 0 {32-jdk17 => 35-jdk11}/tools/license_accepter | 0 {32-ndk => 35-ndk}/Dockerfile | 81 ++++++++------- {32-ndk => 35-ndk}/tools/adb-all | 0 {32-ndk => 35-ndk}/tools/license_accepter | 0 {32-stf-client => 35-stf-client}/Dockerfile | 97 +++++++++--------- .../tools/adb-all | 0 .../tools/license_accepter | 0 {32-jdk17 => 35}/Dockerfile | 81 ++++++++------- {32 => 35}/tools/adb-all | 0 {32 => 35}/tools/license_accepter | 0 Dockerfile.template | 99 ++++++++++--------- README.md | 11 ++- update.sh | 12 +-- 32 files changed, 789 insertions(+), 565 deletions(-) create mode 100644 .gitignore rename {32-emulator => 35-emulator}/Dockerfile (60%) rename {32-emulator => 35-emulator}/tools-emulator/android-start-emulator (100%) rename {32-emulator => 35-emulator}/tools-emulator/android-wait-for-emulator (100%) rename {32-emulator => 35-emulator}/tools/adb-all (100%) rename {32-emulator => 35-emulator}/tools/license_accepter (100%) rename {32 => 35-jdk11}/Dockerfile (54%) rename {32-jdk17 => 35-jdk11}/tools/adb-all (100%) rename {32-jdk17 => 35-jdk11}/tools/license_accepter (100%) rename {32-ndk => 35-ndk}/Dockerfile (57%) rename {32-ndk => 35-ndk}/tools/adb-all (100%) rename {32-ndk => 35-ndk}/tools/license_accepter (100%) rename {32-stf-client => 35-stf-client}/Dockerfile (54%) rename {32-stf-client => 35-stf-client}/tools/adb-all (100%) rename {32-stf-client => 35-stf-client}/tools/license_accepter (100%) rename {32-jdk17 => 35}/Dockerfile (54%) rename {32 => 35}/tools/adb-all (100%) rename {32 => 35}/tools/license_accepter (100%) diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml index b80240c..4ae2abe 100644 --- a/.github/workflows/release-image.yml +++ b/.github/workflows/release-image.yml @@ -76,7 +76,7 @@ jobs: packages: write strategy: matrix: - version: ["32", "33", "34"] + version: ["33", "34", "35"] variant: ["", "-emulator", "-ndk", "-stf-client", "-jdk17", "-jdk11"] needs: [checks-hadolint, checks-shfmt, checks-shellcheck, checks-update] steps: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..494f4a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build_docker_images.sh +docker_build_log.txt +.DS_Store \ No newline at end of file diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile index 006b8e7..a970b39 100644 --- a/33-emulator/Dockerfile +++ b/33-emulator/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=33.0.2 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -80,16 +82,16 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - file \ - qt5-default \ - libpulse0 \ + file \ + qtbase5-dev \ + libpulse0 \ && rm -rf /var/lib/apt/lists/* ENV ANDROID_EMULATOR_PACKAGE="system-images;android-$ANDROID_PLATFORM_VERSION;google_apis_playstore;x86_64" RUN sdkmanager --verbose "emulator" $ANDROID_EMULATOR_PACKAGE # Fix for emulator detect 64bit -ENV SHELL=/bin/bash +ENV SHELL=/bin/bash # https://www.bram.us/2017/05/12/launching-the-android-emulator-from-the-command-line/ ENV PATH=$ANDROID_SDK_ROOT/emulator:$PATH @@ -102,12 +104,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/33-jdk17/Dockerfile b/33-jdk17/Dockerfile index b68d639..5855f41 100644 --- a/33-jdk17/Dockerfile +++ b/33-jdk17/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=33.0.2 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile index c2480f1..0f05128 100644 --- a/33-ndk/Dockerfile +++ b/33-ndk/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=33.0.2 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -87,12 +89,25 @@ RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile index 72f756d..224e7ea 100644 --- a/33-stf-client/Dockerfile +++ b/33-stf-client/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,26 +73,21 @@ ENV ANDROID_BUILD_TOOLS_VERSION=33.0.2 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES #### # hadolint ignore=DL3008,DL3028,SC2086 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ruby \ - && savedAptMark="$(apt-mark showmanual)" \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - # stf-client - build-essential \ - gem \ + ruby-full \ + #stf-client + build-essential \ + rubygems \ # Without rake fails to install stf-client && gem install rake stf-client --no-doc \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && rm -rf /var/lib/apt/lists/* \ - + && rm -rf /var/lib/apt/lists/* RUN adb keygen ~/.android/adbkey #### @@ -100,12 +96,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/33/Dockerfile b/33/Dockerfile index 522c297..30d5649 100644 --- a/33/Dockerfile +++ b/33/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=33.0.2 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/34-emulator/Dockerfile b/34-emulator/Dockerfile index 0acf75d..180f1f3 100644 --- a/34-emulator/Dockerfile +++ b/34-emulator/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -80,16 +82,16 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - file \ - qt5-default \ - libpulse0 \ + file \ + qtbase5-dev \ + libpulse0 \ && rm -rf /var/lib/apt/lists/* ENV ANDROID_EMULATOR_PACKAGE="system-images;android-$ANDROID_PLATFORM_VERSION;google_apis_playstore;x86_64" RUN sdkmanager --verbose "emulator" $ANDROID_EMULATOR_PACKAGE # Fix for emulator detect 64bit -ENV SHELL=/bin/bash +ENV SHELL=/bin/bash # https://www.bram.us/2017/05/12/launching-the-android-emulator-from-the-command-line/ ENV PATH=$ANDROID_SDK_ROOT/emulator:$PATH @@ -102,12 +104,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/34-jdk11/Dockerfile b/34-jdk11/Dockerfile index d664859..446d13b 100644 --- a/34-jdk11/Dockerfile +++ b/34-jdk11/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/34-ndk/Dockerfile b/34-ndk/Dockerfile index 2100ed3..b036a8a 100644 --- a/34-ndk/Dockerfile +++ b/34-ndk/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -87,12 +89,25 @@ RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/34-stf-client/Dockerfile b/34-stf-client/Dockerfile index 3bfca7e..339b1c1 100644 --- a/34-stf-client/Dockerfile +++ b/34-stf-client/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,26 +73,21 @@ ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES #### # hadolint ignore=DL3008,DL3028,SC2086 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ruby \ - && savedAptMark="$(apt-mark showmanual)" \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - # stf-client - build-essential \ - gem \ + ruby-full \ + #stf-client + build-essential \ + rubygems \ # Without rake fails to install stf-client && gem install rake stf-client --no-doc \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && rm -rf /var/lib/apt/lists/* \ - + && rm -rf /var/lib/apt/lists/* RUN adb keygen ~/.android/adbkey #### @@ -100,12 +96,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/34/Dockerfile b/34/Dockerfile index 41f67e4..62b9e43 100644 --- a/34/Dockerfile +++ b/34/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_20.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,7 +73,8 @@ ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32-emulator/Dockerfile b/35-emulator/Dockerfile similarity index 60% rename from 32-emulator/Dockerfile rename to 35-emulator/Dockerfile index f3b97d5..428f330 100644 --- a/32-emulator/Dockerfile +++ b/35-emulator/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -67,12 +68,13 @@ ENV PATH=/opt/tools:$PATH RUN license_accepter # Install Android platform and things -ENV ANDROID_PLATFORM_VERSION=32 -ENV ANDROID_BUILD_TOOLS_VERSION=32.0.0 +ENV ANDROID_PLATFORM_VERSION=35 +ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH -ENV ANDROID_EXTRA_PACKAGES="build-tools;32.0.0" +ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -80,16 +82,16 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - file \ - qt5-default \ - libpulse0 \ + file \ + qtbase5-dev \ + libpulse0 \ && rm -rf /var/lib/apt/lists/* ENV ANDROID_EMULATOR_PACKAGE="system-images;android-$ANDROID_PLATFORM_VERSION;google_apis_playstore;x86_64" RUN sdkmanager --verbose "emulator" $ANDROID_EMULATOR_PACKAGE # Fix for emulator detect 64bit -ENV SHELL=/bin/bash +ENV SHELL=/bin/bash # https://www.bram.us/2017/05/12/launching-the-android-emulator-from-the-command-line/ ENV PATH=$ANDROID_SDK_ROOT/emulator:$PATH @@ -102,12 +104,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32-emulator/tools-emulator/android-start-emulator b/35-emulator/tools-emulator/android-start-emulator similarity index 100% rename from 32-emulator/tools-emulator/android-start-emulator rename to 35-emulator/tools-emulator/android-start-emulator diff --git a/32-emulator/tools-emulator/android-wait-for-emulator b/35-emulator/tools-emulator/android-wait-for-emulator similarity index 100% rename from 32-emulator/tools-emulator/android-wait-for-emulator rename to 35-emulator/tools-emulator/android-wait-for-emulator diff --git a/32-emulator/tools/adb-all b/35-emulator/tools/adb-all similarity index 100% rename from 32-emulator/tools/adb-all rename to 35-emulator/tools/adb-all diff --git a/32-emulator/tools/license_accepter b/35-emulator/tools/license_accepter similarity index 100% rename from 32-emulator/tools/license_accepter rename to 35-emulator/tools/license_accepter diff --git a/32/Dockerfile b/35-jdk11/Dockerfile similarity index 54% rename from 32/Dockerfile rename to 35-jdk11/Dockerfile index bbef90c..047b5fb 100644 --- a/32/Dockerfile +++ b/35-jdk11/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-11-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -67,12 +68,13 @@ ENV PATH=/opt/tools:$PATH RUN license_accepter # Install Android platform and things -ENV ANDROID_PLATFORM_VERSION=32 -ENV ANDROID_BUILD_TOOLS_VERSION=32.0.0 +ENV ANDROID_PLATFORM_VERSION=35 +ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH -ENV ANDROID_EXTRA_PACKAGES="build-tools;32.0.0" +ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32-jdk17/tools/adb-all b/35-jdk11/tools/adb-all similarity index 100% rename from 32-jdk17/tools/adb-all rename to 35-jdk11/tools/adb-all diff --git a/32-jdk17/tools/license_accepter b/35-jdk11/tools/license_accepter similarity index 100% rename from 32-jdk17/tools/license_accepter rename to 35-jdk11/tools/license_accepter diff --git a/32-ndk/Dockerfile b/35-ndk/Dockerfile similarity index 57% rename from 32-ndk/Dockerfile rename to 35-ndk/Dockerfile index ec5e977..95eecc2 100644 --- a/32-ndk/Dockerfile +++ b/35-ndk/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -67,12 +68,13 @@ ENV PATH=/opt/tools:$PATH RUN license_accepter # Install Android platform and things -ENV ANDROID_PLATFORM_VERSION=32 -ENV ANDROID_BUILD_TOOLS_VERSION=32.0.0 +ENV ANDROID_PLATFORM_VERSION=35 +ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH -ENV ANDROID_EXTRA_PACKAGES="build-tools;32.0.0" +ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -87,12 +89,25 @@ RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32-ndk/tools/adb-all b/35-ndk/tools/adb-all similarity index 100% rename from 32-ndk/tools/adb-all rename to 35-ndk/tools/adb-all diff --git a/32-ndk/tools/license_accepter b/35-ndk/tools/license_accepter similarity index 100% rename from 32-ndk/tools/license_accepter rename to 35-ndk/tools/license_accepter diff --git a/32-stf-client/Dockerfile b/35-stf-client/Dockerfile similarity index 54% rename from 32-stf-client/Dockerfile rename to 35-stf-client/Dockerfile index 4633cec..da26301 100644 --- a/32-stf-client/Dockerfile +++ b/35-stf-client/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-11-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -67,31 +68,26 @@ ENV PATH=/opt/tools:$PATH RUN license_accepter # Install Android platform and things -ENV ANDROID_PLATFORM_VERSION=32 -ENV ANDROID_BUILD_TOOLS_VERSION=32.0.0 +ENV ANDROID_PLATFORM_VERSION=35 +ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH -ENV ANDROID_EXTRA_PACKAGES="build-tools;32.0.0" +ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES #### # hadolint ignore=DL3008,DL3028,SC2086 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ruby \ - && savedAptMark="$(apt-mark showmanual)" \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - # stf-client - build-essential \ - gem \ + ruby-full \ + #stf-client + build-essential \ + rubygems \ # Without rake fails to install stf-client && gem install rake stf-client --no-doc \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && rm -rf /var/lib/apt/lists/* \ - + && rm -rf /var/lib/apt/lists/* RUN adb keygen ~/.android/adbkey #### @@ -100,12 +96,25 @@ RUN adb keygen ~/.android/adbkey #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32-stf-client/tools/adb-all b/35-stf-client/tools/adb-all similarity index 100% rename from 32-stf-client/tools/adb-all rename to 35-stf-client/tools/adb-all diff --git a/32-stf-client/tools/license_accepter b/35-stf-client/tools/license_accepter similarity index 100% rename from 32-stf-client/tools/license_accepter rename to 35-stf-client/tools/license_accepter diff --git a/32-jdk17/Dockerfile b/35/Dockerfile similarity index 54% rename from 32-jdk17/Dockerfile rename to 35/Dockerfile index ee6faff..871e752 100644 --- a/32-jdk17/Dockerfile +++ b/35/Dockerfile @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-17-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-17-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -67,12 +68,13 @@ ENV PATH=/opt/tools:$PATH RUN license_accepter # Install Android platform and things -ENV ANDROID_PLATFORM_VERSION=32 -ENV ANDROID_BUILD_TOOLS_VERSION=32.0.0 +ENV ANDROID_PLATFORM_VERSION=35 +ENV ANDROID_BUILD_TOOLS_VERSION=35.0.1 ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH -ENV ANDROID_EXTRA_PACKAGES="build-tools;32.0.0" +ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES @@ -81,12 +83,25 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/32/tools/adb-all b/35/tools/adb-all similarity index 100% rename from 32/tools/adb-all rename to 35/tools/adb-all diff --git a/32/tools/license_accepter b/35/tools/license_accepter similarity index 100% rename from 32/tools/license_accepter rename to 35/tools/license_accepter diff --git a/Dockerfile.template b/Dockerfile.template index 2785323..1a1824c 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,17 +1,18 @@ -FROM ubuntu:focal +FROM ubuntu:jammy SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - expect \ - locales \ - nano \ - openjdk-%%JDK_VERSION%%-jdk \ - unzip \ - curl \ - xz-utils \ - git \ + expect \ + apt-utils \ + locales \ + nano \ + openjdk-%%JDK_VERSION%%-jdk \ + unzip \ + curl \ + xz-utils \ + git \ && rm -rf /var/lib/apt/lists/* # Seems somethings build better with utf8 locale specified @@ -26,21 +27,21 @@ ENV LC_ALL=en_US.UTF-8 # hadolint ignore=DL3008 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - apt-transport-https \ - gnupg \ - lsb-release \ + ca-certificates \ + apt-transport-https \ + gnupg \ + lsb-release \ # For nodejs we use nodesource, its nice and easy and gets us the correct version # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions - && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_%%NODE_VARIANT%%.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src https://deb.nodesource.com/node_%%NODE_VARIANT%%.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_%%NODE_VARIANT%%.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ - nodejs \ + nodejs \ && rm -rf /var/lib/apt/lists/* # hadolint ignore=DL3016 -RUN npm -g install xcode-build-tools yarn +RUN npm install -g xcode-build-tools yarn #### # Install the SDK @@ -48,12 +49,12 @@ RUN npm -g install xcode-build-tools yarn ENV ANDROID_CMDLINE_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip # hadolint ignore=DL3003 RUN ( \ - cd /opt \ - && mkdir android-sdk-linux \ - && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ - && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ - && rm -f cmdline-tools.zip \ - && chown -R root:root android-sdk-linux \ + cd /opt \ + && mkdir android-sdk-linux \ + && curl -sSL -o cmdline-tools.zip "$ANDROID_CMDLINE_TOOLS" \ + && unzip cmdline-tools.zip -d android-sdk-linux/cmdline-tools \ + && rm -f cmdline-tools.zip \ + && chown -R root:root android-sdk-linux \ ) ENV ANDROID_SDK_ROOT=/opt/android-sdk-linux @@ -72,26 +73,21 @@ ENV ANDROID_BUILD_TOOLS_VERSION=%%BUILD_TOOLS%% ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES=%%EXTRA_PACKAGES%% ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" -ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +#ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" +RUN sdkmanager --update RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES #### # hadolint ignore=DL3008,DL3028,SC2086 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ruby \ - && savedAptMark="$(apt-mark showmanual)" \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - # stf-client - build-essential \ - gem \ + ruby-full \ + #stf-client + build-essential \ + rubygems \ # Without rake fails to install stf-client && gem install rake stf-client --no-doc \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && rm -rf /var/lib/apt/lists/* \ - + && rm -rf /var/lib/apt/lists/* RUN adb keygen ~/.android/adbkey #### @@ -99,16 +95,16 @@ RUN adb keygen ~/.android/adbkey # hadolint ignore=DL3008 RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - file \ - qt5-default \ - libpulse0 \ + file \ + qtbase5-dev \ + libpulse0 \ && rm -rf /var/lib/apt/lists/* ENV ANDROID_EMULATOR_PACKAGE="system-images;android-$ANDROID_PLATFORM_VERSION;google_apis_playstore;x86_64" RUN sdkmanager --verbose "emulator" $ANDROID_EMULATOR_PACKAGE # Fix for emulator detect 64bit -ENV SHELL=/bin/bash +ENV SHELL=/bin/bash # https://www.bram.us/2017/05/12/launching-the-android-emulator-from-the-command-line/ ENV PATH=$ANDROID_SDK_ROOT/emulator:$PATH @@ -127,12 +123,25 @@ RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES #### # hadolint ignore=DL3008,SC1091 RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg2 build-essential \ && rm -rf /var/lib/apt/lists/* \ - && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ - && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ - && source /usr/local/rvm/scripts/rvm \ - && gem install bundler -v '~> 1.0' --force --no-document --default + && gpg2 --keyserver keyserver.ubuntu.com --recv-keys \ + 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ + && curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler" \ + && echo 'source /usr/local/rvm/scripts/rvm' >> /etc/bash.bashrc + ENV BASH_ENV="/usr/local/rvm/scripts/rvm" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + rvm install 3.1.2 && \ + rvm install 3.4.3 && \ + rvm alias create default 3.4.3" + +RUN bash -c "source /usr/local/rvm/scripts/rvm && \ + for v in 3.1.2 3.4.3; do \ + rvm use $v; \ + gem install bundler -v '~>2.0' --no-document; \ + done \ + " #### diff --git a/README.md b/README.md index 4f3b3c7..9b4b8aa 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,11 @@ An image that lets us build android apps with docker using gitlab-ci ## Tags available +* `35` +* `35-emulator` +* `35-ndk` +* `35-stf-client` +* `35-jdk11` * `34` * `34-emulator` * `34-ndk` @@ -14,14 +19,14 @@ An image that lets us build android apps with docker using gitlab-ci * `33-ndk` * `33-stf-client` * `33-jdk17` + +## Unmaintained tags + * `32` * `32-emulator` * `32-ndk` * `32-stf-client` * `32-jdk17` - -## Unmaintained tags - * `31` * `31-emulator` * `31-ndk` diff --git a/update.sh b/update.sh index 2d37a3b..1ab7b58 100755 --- a/update.sh +++ b/update.sh @@ -1,33 +1,33 @@ #!/usr/bin/env bash set -e -variants=('32' '33' '34') +variants=('33' '34' '35') ## Disabled creating extra node variants, rather just having a default for each SDK -#node_variants=('14' '18') +#node_variants=('18' '20') declare -A default_node_variants=( - ['32']='18' ['33']='18' ['34']='20' + ['35']='20' ) jdk_variants=('11' '17') declare -A default_jdk_variants=( - ['32']='11' ['33']='11' ['34']='17' + ['35']='17' ) declare -A build_tools=( - ['32']='32.0.0' ['33']='33.0.2' ['34']='34.0.0' + ['35']='35.0.1' ) declare -A extra_packages=( - ['32']='"build-tools;32.0.0"' ['33']='"build-tools;33.0.0 build-tools;33.0.1"' ['34']='' + ['35']='' ) for variant in "${variants[@]}"; do From c3e7ffb266bf9ff80fd55e4732e66b7a11469131 Mon Sep 17 00:00:00 2001 From: Pavlo Vykhrov Date: Wed, 21 May 2025 11:52:54 +0300 Subject: [PATCH 2/3] fix: install bundler --- 33-emulator/Dockerfile | 8 ++++---- 33-jdk17/Dockerfile | 8 ++++---- 33-ndk/Dockerfile | 8 ++++---- 33-stf-client/Dockerfile | 8 ++++---- 33/Dockerfile | 8 ++++---- 34-emulator/Dockerfile | 8 ++++---- 34-jdk11/Dockerfile | 8 ++++---- 34-ndk/Dockerfile | 8 ++++---- 34-stf-client/Dockerfile | 8 ++++---- 34/Dockerfile | 8 ++++---- 35-emulator/Dockerfile | 8 ++++---- 35-jdk11/Dockerfile | 8 ++++---- 35-ndk/Dockerfile | 8 ++++---- 35-stf-client/Dockerfile | 8 ++++---- 35/Dockerfile | 8 ++++---- Dockerfile.template | 8 ++++---- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile index a970b39..44c85ec 100644 --- a/33-emulator/Dockerfile +++ b/33-emulator/Dockerfile @@ -120,9 +120,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/33-jdk17/Dockerfile b/33-jdk17/Dockerfile index 5855f41..6acbfcd 100644 --- a/33-jdk17/Dockerfile +++ b/33-jdk17/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile index 0f05128..c54cd7a 100644 --- a/33-ndk/Dockerfile +++ b/33-ndk/Dockerfile @@ -105,9 +105,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile index 224e7ea..3572058 100644 --- a/33-stf-client/Dockerfile +++ b/33-stf-client/Dockerfile @@ -112,9 +112,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/33/Dockerfile b/33/Dockerfile index 30d5649..38255b9 100644 --- a/33/Dockerfile +++ b/33/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/34-emulator/Dockerfile b/34-emulator/Dockerfile index 180f1f3..baf790d 100644 --- a/34-emulator/Dockerfile +++ b/34-emulator/Dockerfile @@ -120,9 +120,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/34-jdk11/Dockerfile b/34-jdk11/Dockerfile index 446d13b..03f468a 100644 --- a/34-jdk11/Dockerfile +++ b/34-jdk11/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/34-ndk/Dockerfile b/34-ndk/Dockerfile index b036a8a..c7c75d1 100644 --- a/34-ndk/Dockerfile +++ b/34-ndk/Dockerfile @@ -105,9 +105,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/34-stf-client/Dockerfile b/34-stf-client/Dockerfile index 339b1c1..5803ff3 100644 --- a/34-stf-client/Dockerfile +++ b/34-stf-client/Dockerfile @@ -112,9 +112,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/34/Dockerfile b/34/Dockerfile index 62b9e43..3b357f2 100644 --- a/34/Dockerfile +++ b/34/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/35-emulator/Dockerfile b/35-emulator/Dockerfile index 428f330..1aa9fe9 100644 --- a/35-emulator/Dockerfile +++ b/35-emulator/Dockerfile @@ -120,9 +120,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/35-jdk11/Dockerfile b/35-jdk11/Dockerfile index 047b5fb..1e2496f 100644 --- a/35-jdk11/Dockerfile +++ b/35-jdk11/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/35-ndk/Dockerfile b/35-ndk/Dockerfile index 95eecc2..c483605 100644 --- a/35-ndk/Dockerfile +++ b/35-ndk/Dockerfile @@ -105,9 +105,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/35-stf-client/Dockerfile b/35-stf-client/Dockerfile index da26301..c9f748a 100644 --- a/35-stf-client/Dockerfile +++ b/35-stf-client/Dockerfile @@ -112,9 +112,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/35/Dockerfile b/35/Dockerfile index 871e752..dc81ba0 100644 --- a/35/Dockerfile +++ b/35/Dockerfile @@ -99,9 +99,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### diff --git a/Dockerfile.template b/Dockerfile.template index 1a1824c..e2c087f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -139,9 +139,9 @@ RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm alias create default 3.4.3" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - for v in 3.1.2 3.4.3; do \ - rvm use $v; \ - gem install bundler -v '~>2.0' --no-document; \ - done \ + rvm use 3.1.2 && \ + gem install bundler -v '~>2.0' --no-document && \ + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document \ " #### From 4a60a857e74067c6dcb3cff85821f6dc66bd82bb Mon Sep 17 00:00:00 2001 From: Pavlo Vykhrov Date: Thu, 22 May 2025 12:09:44 +0300 Subject: [PATCH 3/3] fix: SC2086 DL3059 --- 33-emulator/Dockerfile | 21 ++++++++++++--------- 33-jdk17/Dockerfile | 21 ++++++++++++--------- 33-ndk/Dockerfile | 21 ++++++++++++--------- 33-stf-client/Dockerfile | 21 ++++++++++++--------- 33/Dockerfile | 21 ++++++++++++--------- 34-emulator/Dockerfile | 21 ++++++++++++--------- 34-jdk11/Dockerfile | 21 ++++++++++++--------- 34-ndk/Dockerfile | 21 ++++++++++++--------- 34-stf-client/Dockerfile | 21 ++++++++++++--------- 34/Dockerfile | 21 ++++++++++++--------- 35-emulator/Dockerfile | 21 ++++++++++++--------- 35-jdk11/Dockerfile | 21 ++++++++++++--------- 35-ndk/Dockerfile | 21 ++++++++++++--------- 35-stf-client/Dockerfile | 21 ++++++++++++--------- 35/Dockerfile | 21 ++++++++++++--------- Dockerfile.template | 21 ++++++++++++--------- 16 files changed, 192 insertions(+), 144 deletions(-) diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile index 44c85ec..98eea7e 100644 --- a/33-emulator/Dockerfile +++ b/33-emulator/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### @@ -117,12 +123,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/33-jdk17/Dockerfile b/33-jdk17/Dockerfile index 6acbfcd..02defbd 100644 --- a/33-jdk17/Dockerfile +++ b/33-jdk17/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile index c54cd7a..dc13394 100644 --- a/33-ndk/Dockerfile +++ b/33-ndk/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -102,12 +108,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile index 3572058..4daabdd 100644 --- a/33-stf-client/Dockerfile +++ b/33-stf-client/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### # hadolint ignore=DL3008,DL3028,SC2086 @@ -109,12 +115,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/33/Dockerfile b/33/Dockerfile index 38255b9..a647262 100644 --- a/33/Dockerfile +++ b/33/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES="build-tools;33.0.0 build-tools;33.0.1" ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/34-emulator/Dockerfile b/34-emulator/Dockerfile index baf790d..3db036b 100644 --- a/34-emulator/Dockerfile +++ b/34-emulator/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### @@ -117,12 +123,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/34-jdk11/Dockerfile b/34-jdk11/Dockerfile index 03f468a..3e75eaa 100644 --- a/34-jdk11/Dockerfile +++ b/34-jdk11/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/34-ndk/Dockerfile b/34-ndk/Dockerfile index c7c75d1..b56170e 100644 --- a/34-ndk/Dockerfile +++ b/34-ndk/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -102,12 +108,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/34-stf-client/Dockerfile b/34-stf-client/Dockerfile index 5803ff3..9cb8888 100644 --- a/34-stf-client/Dockerfile +++ b/34-stf-client/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### # hadolint ignore=DL3008,DL3028,SC2086 @@ -109,12 +115,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/34/Dockerfile b/34/Dockerfile index 3b357f2..aad8185 100644 --- a/34/Dockerfile +++ b/34/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/35-emulator/Dockerfile b/35-emulator/Dockerfile index 1aa9fe9..01b7fc6 100644 --- a/35-emulator/Dockerfile +++ b/35-emulator/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### @@ -117,12 +123,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/35-jdk11/Dockerfile b/35-jdk11/Dockerfile index 1e2496f..72fe8bb 100644 --- a/35-jdk11/Dockerfile +++ b/35-jdk11/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/35-ndk/Dockerfile b/35-ndk/Dockerfile index c483605..d15bf00 100644 --- a/35-ndk/Dockerfile +++ b/35-ndk/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -102,12 +108,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/35-stf-client/Dockerfile b/35-stf-client/Dockerfile index c9f748a..943b532 100644 --- a/35-stf-client/Dockerfile +++ b/35-stf-client/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### # hadolint ignore=DL3008,DL3028,SC2086 @@ -109,12 +115,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/35/Dockerfile b/35/Dockerfile index dc81ba0..af99bf2 100644 --- a/35/Dockerfile +++ b/35/Dockerfile @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES= ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} @@ -96,12 +102,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" #### diff --git a/Dockerfile.template b/Dockerfile.template index e2c087f..fe7a109 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -74,8 +74,14 @@ ENV PATH=$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH ENV ANDROID_EXTRA_PACKAGES=%%EXTRA_PACKAGES%% ENV ANDROID_REPOSITORIES="extras;android;m2repository extras;google;m2repository" #ENV ANDROID_CONSTRAINT_PACKAGES="extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1 extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" -RUN sdkmanager --update -RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_VERSION" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" $ANDROID_EXTRA_PACKAGES $ANDROID_REPOSITORIES $ANDROID_CONSTRAINT_PACKAGES +RUN sdkmanager --update && \ + sdkmanager --verbose \ + "platform-tools" \ + "platforms;android-${ANDROID_PLATFORM_VERSION}" \ + "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + ${ANDROID_EXTRA_PACKAGES:+${ANDROID_EXTRA_PACKAGES}} \ + ${ANDROID_REPOSITORIES:+${ANDROID_REPOSITORIES}} \ + ${ANDROID_CONSTRAINT_PACKAGES:+${ANDROID_CONSTRAINT_PACKAGES}} #### # hadolint ignore=DL3008,DL3028,SC2086 @@ -136,12 +142,9 @@ ENV BASH_ENV="/usr/local/rvm/scripts/rvm" RUN bash -c "source /usr/local/rvm/scripts/rvm && \ rvm install 3.1.2 && \ rvm install 3.4.3 && \ - rvm alias create default 3.4.3" - -RUN bash -c "source /usr/local/rvm/scripts/rvm && \ - rvm use 3.1.2 && \ + rvm alias create default 3.4.3 && \ + rvm use 3.1.2 && \ gem install bundler -v '~>2.0' --no-document && \ - rvm use 3.4.3 && \ - gem install bundler -v '~>2.0' --no-document \ - " + rvm use 3.4.3 && \ + gem install bundler -v '~>2.0' --no-document" ####