From 8c9be9112c429aba34fa5bd7446f2baea23ea1bc Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Sat, 9 Mar 2024 04:00:03 +0100
Subject: [PATCH] Ubuntu 22.04 & Java 17
---
Dockerfile | 6 +++---
packages.txt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b18a190..f820eb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
MAINTAINER Jan Grewe <jan@faked.org>
ENV VERSION_TOOLS "8512546"
@@ -15,10 +15,10 @@ RUN apt-get -qq update \
curl \
git-core \
html2text \
- openjdk-11-jdk \
+ openjdk-17-jdk \
libc6-i386 \
lib32stdc++6 \
- lib32gcc1 \
+ lib32gcc-s1 \
lib32ncurses6 \
lib32z1 \
unzip \
diff --git a/packages.txt b/packages.txt
index 2563e3e..8bef9ee 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,7 +1,7 @@
add-ons;addon-google_apis-google-24
-build-tools;33.0.0
+build-tools;34.0.0
extras;android;m2repository
extras;google;m2repository
extras;google;google_play_services
extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
-platforms;android-33
+platforms;android-34
--
GitLab