firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual roll of docker focal version. (#132536)

Browse Source 
This manual roll is needed to update the jdk apt package.

Bug: https://github.com/flutter/flutter/issues/132531
This commit is contained in:
godofredoc 2023-08-14 18:27:32 -07:00 committed by GitHub
parent 2f54ff6c99
commit 29924c7ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/ci/docker_linux/Dockerfile
View File

@ -12,7 +12,7 @@
# Last manual update 2021-09-24 (changing this comment will re-build image) # Last manual update 2021-09-24 (changing this comment will re-build image)
FROM ubuntu:focal@sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 FROM ubuntu:focal@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba
MAINTAINER Flutter Developers <flutter-dev@googlegroups.com> MAINTAINER Flutter Developers <flutter-dev@googlegroups.com>
ENV TZ=America/Los_Angeles ENV TZ=America/Los_Angeles
@ -48,14 +48,9 @@ RUN apt-get update && apt-get install -y google-cloud-sdk && \
gcloud config set core/disable_usage_reporting true && \ gcloud config set core/disable_usage_reporting true && \
gcloud config set component_manager/disable_update_check true gcloud config set component_manager/disable_update_check true
# Add repo for OpenJDK from JFrog.io
RUN wget -q -O - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
RUN echo 'deb [arch=amd64] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb bullseye main' | \
tee /etc/apt/sources.list.d/adoptopenjdk.list
# Install the dependencies needed for the rest of the build. # Install the dependencies needed for the rest of the build.
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
adoptopenjdk-11-hotspot \ openjdk-17-jdk \
build-essential \ build-essential \
default-jdk-headless \ default-jdk-headless \
gcc \ gcc \
@ -70,7 +65,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ruby-dev && \ ruby-dev && \
apt-get clean apt-get clean
ENV JAVA_HOME="/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64" ENV JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
# Install the Android SDK Dependency. # Install the Android SDK Dependency.
# In the event of an update you can visit this page: https://developer.android.com/studio and scroll to the bottom to find # In the event of an update you can visit this page: https://developer.android.com/studio and scroll to the bottom to find