ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated java version from 8 to 17. Updated all dependencies.

Browse Source 
The tournament and league tests now all fail, due to poorly designed mock tests for tournaments.  That will require a rewrite of the base classes to take a more IOC approach.
This commit is contained in:
Christian 'ketura' McCarty
2022-07-28 19:52:24 -05:00
parent 6438ee479c
commit e316984ce9
9 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gemp-lotr/docker/gemp_app.Dockerfile
View File

@@ -1,7 +1,7 @@
FROM alpine
FROM amazoncorretto:18-alpine-jdk
RUN apk update; \
apk update --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community; \
apk update \
apk add --no-cache procps; \
apk add --no-cache net-tools; \
apk add --no-cache iputils; \
@@ -15,8 +15,7 @@ RUN apk update; \
apk add --no-cache freetype; \
apk add --no-cache fontconfig; \
apk add --no-cache git; \
apk add --no-cache nano; \
apk add --no-cache openjdk14-jdk --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community;
apk add --no-cache nano;
@@ -25,13 +24,13 @@ RUN apk update; \
# https://github.com/carlossg/docker-maven/blob/26ba49149787c85b9c51222b47c00879b2a0afde/openjdk-14/Dockerfile
#####################################################################
ARG MAVEN_VERSION=3.6.3
ARG MAVEN_VERSION=3.8.6
ARG USER_HOME_DIR="/root"
ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
ARG SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
&& curl -fsSkL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
&& curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
&& echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \
&& tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
&& rm -f /tmp/apache-maven.tar.gz \