In order to mitigate against the brute force attacks against Gitlab accounts, we are moving to all edu-ID Logins. We would like to remind you to link your account with your edu-id. Login will be possible only by edu-ID after November 30, 2021. Here you can find the instructions for linking your account.

If you don't have a SWITCH edu-ID, you can create one with this guide here

kind regards

Verified Commit 2a4d1921 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

Merge branch '5.x' into 4.x

parents 44e2be52 b179dd35
Pipeline #31395 passed with stages
in 6 minutes and 49 seconds
......@@ -18,6 +18,10 @@ include:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKERFILE --destination $IMAGE_TAG --build-arg BUILD_WITH="$BUILD_WITH"
retry:
max: 2
when:
- script_failure
build-latest:
extends: .build-image
......
FROM debian:buster-slim AS build
ARG VERSION=4.1.7
# Change the VERSION envvar according to the cantaloupe version. Don't forget to change the argument in the ENTRYPOINT command below as well
ARG VERSION=4.1.9
ARG BUILD_WITH=""
WORKDIR /
RUN apt-get -qq update && \
......@@ -14,8 +15,9 @@ RUN wget -q https://github.com/cantaloupe-project/cantaloupe/releases/download/v
rm cantaloupe/cantaloupe.properties.sample
ADD ./cantaloupe.properties /cantaloupe/cantaloupe.properties
FROM openjdk:11-jre-slim
ENTRYPOINT ["/home/cantaloupe/run.sh", "4.1.7"]
FROM openjdk:16-slim-buster
# Change the version argument according to the cantaloupe version
ENTRYPOINT ["/home/cantaloupe/run.sh", "4.1.9"]
CMD ["-Dcantaloupe.config=/home/cantaloupe/app/cantaloupe.properties", "-Xmx4g", "-Xms800m"]
ARG HTTP_PORT=8182
ARG BUILD_WITH=""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment