mirror of
https://github.com/gotson/komga.git
synced 2026-05-08 21:00:16 +02:00
Push docker base to Ubuntu 26.04
- Because of https://github.com/gotson/komga/issues/2021, the ubuntu base was downgrade to 24.10 which is now EOL. - 25.10 was never bumped in ubuntu repos but it's EOL in july. - Ubuntu 26.04 LTS is expected to release in less than a month This gets rids of a lot of CVEs in packages
This commit is contained in:
parent
e3a8cc6b01
commit
0b28f8f5ae
1 changed files with 4 additions and 6 deletions
|
|
@ -5,12 +5,11 @@ COPY assembly/${JAR} application.jar
|
|||
RUN java -Djarmode=tools -jar application.jar extract --layers --destination extracted
|
||||
|
||||
# amd64 builder
|
||||
FROM ubuntu:24.10 AS build-amd64
|
||||
FROM ubuntu:26.04 AS build-amd64
|
||||
ENV JAVA_HOME=/opt/java/openjdk
|
||||
COPY --from=eclipse-temurin:23-jre $JAVA_HOME $JAVA_HOME
|
||||
ENV PATH="${JAVA_HOME}/bin:${PATH}"
|
||||
RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list.d/ubuntu.sources && \
|
||||
apt -y update && \
|
||||
RUN apt -y update && \
|
||||
apt -y install ca-certificates locales libjxl-dev libheif-dev libwebp-dev libarchive-dev wget curl && \
|
||||
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
|
||||
locale-gen en_US.UTF-8 && \
|
||||
|
|
@ -20,12 +19,11 @@ RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releas
|
|||
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu"
|
||||
|
||||
# arm64 builder
|
||||
FROM ubuntu:24.10 AS build-arm64
|
||||
FROM ubuntu:26.04 AS build-arm64
|
||||
ENV JAVA_HOME=/opt/java/openjdk
|
||||
COPY --from=eclipse-temurin:23-jre $JAVA_HOME $JAVA_HOME
|
||||
ENV PATH="${JAVA_HOME}/bin:${PATH}"
|
||||
RUN sed -i -re 's/([a-z]{2}\.)?ports.ubuntu.com\/ubuntu-ports/old-releases.ubuntu.com\/ubuntu/g' /etc/apt/sources.list.d/ubuntu.sources && \
|
||||
apt -y update && \
|
||||
RUN apt -y update && \
|
||||
apt -y install ca-certificates locales libjxl-dev libheif-dev libwebp-dev libarchive-dev wget curl && \
|
||||
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
|
||||
locale-gen en_US.UTF-8 && \
|
||||
|
|
|
|||
Loading…
Reference in a new issue