Skip to content

Commit

Permalink
Switch to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
mtneug committed Sep 14, 2023
1 parent dcaf2ef commit c5b78bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apk add --no-cache \
&& mv ff* /usr/local/bin


FROM docker.io/eclipse-temurin:11-jdk AS build-su-exec
FROM docker.io/eclipse-temurin:17-jdk AS build-su-exec
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
gcc \
Expand All @@ -40,7 +40,7 @@ RUN git clone https://github.com/ncopa/su-exec.git /tmp/su-exec \
&& cp su-exec /usr/local/sbin


FROM --platform=${BUILDPLATFORM} docker.io/maven:3-eclipse-temurin-11 AS build-opencast
FROM --platform=${BUILDPLATFORM} docker.io/maven:3-eclipse-temurin-17 AS build-opencast

ARG OPENCAST_REPO="https://github.com/opencast/opencast.git"
ARG OPENCAST_VERSION="develop"
Expand Down Expand Up @@ -81,8 +81,8 @@ ARG OPENCAST_DISTRIBUTION
RUN tar -xzf build/opencast-dist-${OPENCAST_DISTRIBUTION}-*.tar.gz --strip 1 -C "${OPENCAST_HOME}"


FROM docker.io/eclipse-temurin:11-jdk
LABEL org.opencontainers.image.base.name="docker.io/eclipse-temurin:11-jdk"
FROM docker.io/eclipse-temurin:17-jdk
LABEL org.opencontainers.image.base.name="docker.io/eclipse-temurin:17-jdk"

ENV OPENCAST_HOME="/opencast" \
OPENCAST_DATA="/data" \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-build
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apk add --no-cache \
&& mv ff* /usr/local/bin


FROM docker.io/maven:3-eclipse-temurin-11 AS build-su-exec
FROM docker.io/maven:3-eclipse-temurin-17 AS build-su-exec
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
gcc \
Expand All @@ -40,8 +40,8 @@ RUN git clone https://github.com/ncopa/su-exec.git /tmp/su-exec \
&& cp su-exec /usr/local/sbin


FROM docker.io/maven:3-eclipse-temurin-11
LABEL org.opencontainers.image.base.name="docker.io/maven:3-eclipse-temurin-11"
FROM docker.io/maven:3-eclipse-temurin-17
LABEL org.opencontainers.image.base.name="docker.io/maven:3-eclipse-temurin-17"

ARG OPENCAST_REPO="https://github.com/opencast/opencast.git"
ARG OPENCAST_VERSION="develop"
Expand Down

0 comments on commit c5b78bd

Please sign in to comment.