From 47acab766d9b5f28115fb5651fb56e7f7c8fc2a8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 1 Dec 2021 16:11:43 +0100 Subject: [PATCH] :arrow_up: Update to OpenJDK17. --- docker/devenv/Dockerfile | 10 ++++------ docker/devenv/files/bashrc | 2 +- frontend/cypress/videos/.gitkeep | 0 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 frontend/cypress/videos/.gitkeep diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 60452fab2..f8f128363 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -109,16 +109,14 @@ RUN set -x; \ rm -rf /var/lib/apt/lists/*; \ rm -rf /tmp/chrome.deb; - RUN set -ex; \ - curl -LfsSo /tmp/openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz; \ - mkdir -p /usr/lib/jvm/openjdk16; \ - cd /usr/lib/jvm/openjdk16; \ + curl -LfsSo /tmp/openjdk.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz; \ + mkdir -p /usr/lib/jvm/openjdk17; \ + cd /usr/lib/jvm/openjdk17; \ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ rm -rf /tmp/openjdk.tar.gz; -ENV PATH="/usr/lib/jvm/openjdk16/bin:/usr/local/nodejs/bin:$PATH" \ - JAVA_HOME=/usr/lib/jvm/openjdk16 +ENV PATH="/usr/lib/jvm/openjdk17/bin:/usr/local/nodejs/bin:$PATH" JAVA_HOME=/usr/lib/jvm/openjdk17 RUN set -ex; \ curl -LfsSo /tmp/clojure.sh https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh; \ diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc index c7c421504..3ae8341c9 100644 --- a/docker/devenv/files/bashrc +++ b/docker/devenv/files/bashrc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export PATH=/usr/lib/jvm/openjdk16/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin +export PATH=/usr/lib/jvm/openjdk17/bin:/usr/local/nodejs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin alias l='ls --color -GFlh' alias rm='rm -r' diff --git a/frontend/cypress/videos/.gitkeep b/frontend/cypress/videos/.gitkeep deleted file mode 100644 index e69de29bb..000000000