Skip to content

Commit

Permalink
docker base image ..bionic -> 11-jre-hotspot-focal
Browse files Browse the repository at this point in the history
Update from  11-jre-hotspot-bionic to 11-jre-hotspot-focal, since that
image is just 3 months old instead of >1year for the bionic image.

That also allows to install newer dependencies, e.g. the python is no
current enough to support swh.scanner, and also the dependencies of tern
are now available.

Signed-off-by: Maximilian Huber <gh@maxhbr.de>
  • Loading branch information
maxhbr committed Dec 29, 2021
1 parent 1ec0da0 commit 3b123fc
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ RUN --mount=type=cache,target=/tmp/.gradle/ \
sed -i -r '/distributionSha256Sum=[0-9a-f]{64}/d' gradle/wrapper/gradle-wrapper.properties && \
./gradlew --no-daemon --stacktrace -Pversion=$ORT_VERSION :cli:distTar :helper-cli:startScripts

FROM adoptopenjdk:11-jre-hotspot-bionic
FROM adoptopenjdk:11-jre-hotspot-focal

ENV \
# Package manager versions.
BOWER_VERSION=1.8.8 \
CARGO_VERSION=0.54.0-0ubuntu1~18.04.1 \
COMPOSER_VERSION=1.6.3-1 \
CARGO_VERSION=0.54.0-0ubuntu1~20.04.1 \
COMPOSER_VERSION=1.10.1-1 \
CONAN_VERSION=1.43.2 \
GO_DEP_VERSION=0.5.4 \
GO_VERSION=1.16.5 \
Expand Down Expand Up @@ -112,7 +112,6 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
composer=$COMPOSER_VERSION \
nodejs \
python-dev \
python-pip \
python-setuptools \
python3-dev \
python3-pip \
Expand Down

0 comments on commit 3b123fc

Please sign in to comment.