Skip to content

Commit

Permalink
upgrade base eclipse-temurin image to ubuntu 24.04 noble
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-willm committed Jan 10, 2025
1 parent e132067 commit d117196
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# main eclipse-temurin jre, which is debian-based
ARG FROM_REPO_IMAGE=eclipse-temurin
ARG FROM_TAG=17-jre-jammy
ARG FROM_TAG=17-jre-noble

# uncomment for alpine-based eclipse-temurin jre
# ARG FROM_TAG=17-jre-alpine
Expand Down Expand Up @@ -151,22 +151,22 @@ RUN [ -n "${DEBUG}" ] && set -x; \
apt-get update; \
apt-get -yq --no-install-recommends install \
openssl \
gettext-base=0.21-4ubuntu4 \
unzip=6.0-26ubuntu3.1 \
gettext-base=0.21-14ubuntu2 \
unzip=6.0-28ubuntu4.1 \
; \
if [ -n "${DEBUG}" ]; then \
# next 2 lines are to get postgres15 to install on ubuntu 22.04
echo "deb http://apt.postgresql.org/pub/repos/apt $(grep VERSION_CODENAME /etc/os-release | cut -d "=" -f2)-pgdg main" > /etc/apt/sources.list.d/pgdg.list; \
wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | tee /etc/apt/trusted.gpg.d/pgdg.asc > /dev/null 2>&1; \
apt-get update; \
apt-get -yq --no-install-recommends install \
iputils-ping=3:20211215-1 \
less=590-1ubuntu0.22.04.1 \
netcat=1.218-4ubuntu1 \
postgresql-client-15=15.5-1.pgdg22.04+1 \
sudo=1.9.9-1ubuntu2.4 \
tree=2.0.2-1 \
vim=2:8.2.3995-1ubuntu2.13 \
iputils-ping=3:20240117-1build1 \
less=590-2ubuntu2.1 \
netcat-traditional=1.10-48 \
postgresql-client-16=16.6-0ubuntu0.24.04.1 \
sudo=1.9.15p5-3ubuntu5 \
tree=2.1.1-2ubuntu3 \
vim=2:9.1.0016-1ubuntu7.5 \
; \
fi; \
apt-get -yq upgrade; \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif

DEBUG ?=

FROM_TAG ?= 17-jre-jammy
FROM_TAG ?= 17-jre-noble

CACHE_FLAG ?= --no-cache

Expand Down

0 comments on commit d117196

Please sign in to comment.