Merge pull request #18 from menny/jdk17

Update README and version

.github/workflows/post_merge_deploy.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   TERM: dumb
-  IMAGE_VERSION: 1.17.0
+  IMAGE_VERSION: 1.18.0
 jobs:
   build_base:
     runs-on: ubuntu-22.04

README.md

@@ -5,9 +5,9 @@ These images are available in Docker Hub and [ghcr.io](https://github.com/menny?
 
 ## Contains:
 
-* Based on `adoptopenjdk/openjdk11:jdk-11.0.12_7-ubuntu-slim` - Ubuntu 20.04 with AdoptOpenJDK 11
+* Based on `ubuntu:focal`
 * with wget, curl, zip, python, pip, git, make, gcc (and other build-essential)
-* AdoptJDK11 - https://github.com/AdoptOpenJDK
+* Corretto JDK17 - https://github.com/corretto/corretto-17/releases
 * cmdline tools 6.0
 * Platform tools 32.0.0
 * Build Tools 32.0.0

android_bazel/Dockerfile

@@ -15,8 +15,8 @@ ENV JAVA_TOOL_OPTIONS=""
 
 # Install Go (required by Bazelisk)
 RUN add-apt-repository ppa:longsleep/golang-backports
-RUN apt update
-RUN apt install -y --allow-remove-essential --allow-change-held-packages golang-go
+RUN apt update \
+    && apt install -y --allow-remove-essential --allow-change-held-packages golang-go
 
 # Install bazelisk
 RUN mkdir /opt/bazelisk