docker JRE ireplacing JRE alpine image to support multiple architecturesmage multi arch supported

Author: leoraba

Dockerfile

@@ -1,8 +1,8 @@
 ###############################
 # Maven builder
 ###############################
-# -alpine-slim image does not support --release flag
-FROM adoptopenjdk/openjdk11:jdk-11.0.6_10-alpine-slim as builder
+# multi arch image including amd64, arm64, ...
+FROM adoptopenjdk/openjdk11:jre-11.0.6_10 as builder
 
 ENV SERVER_JAR_FILE    /score-server.jar
 ENV CLIENT_DIST_DIR    /score-client-dist
@@ -33,7 +33,7 @@ RUN cd score-client/target \
 ###############################
 # Score Client
 ###############################
-FROM ubuntu:18.04 as client
+FROM --platform=linux/amd64 ubuntu:18.04 as client
 
 ENV CLIENT_DIST_DIR    /score-client-dist
 ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk17/ri/openjdk-17+35_linux-x64_bin.tar.gz
@@ -76,7 +76,7 @@ WORKDIR $SCORE_CLIENT_HOME
 ###############################
 # Score Server
 ###############################
-FROM adoptopenjdk/openjdk11:jre-11.0.6_10-alpine as server
+FROM adoptopenjdk/openjdk11:jre-11.0.6_10 as server
 
 # Paths
 ENV SCORE_HOME /score-server
@@ -86,8 +86,8 @@ ENV SCORE_USER score
 ENV SCORE_UID 9999
 ENV SCORE_GID 9999
 
-RUN addgroup -S -g $SCORE_GID $SCORE_USER  \
-    && adduser -S -u $SCORE_UID -G $SCORE_USER $SCORE_USER  \
+RUN addgroup --system --gid $SCORE_GID $SCORE_USER  \
+    && adduser --system --uid $SCORE_UID --ingroup $SCORE_USER $SCORE_USER  \
     && mkdir $SCORE_HOME $SCORE_LOGS \
     && chown -R $SCORE_UID:$SCORE_GID $SCORE_HOME
 

Dockerfile.dev

@@ -1,7 +1,7 @@
 ###############################
 # Score Client
 ###############################
-FROM ubuntu:18.04 as client
+FROM --platform=linux/amd64 ubuntu:18.04 as client
 
 ENV CLIENT_DIST_DIR    /score-client-dist
 ENV JDK_DOWNLOAD_URL https://download.java.net/openjdk/jdk17/ri/openjdk-17+35_linux-x64_bin.tar.gz
@@ -54,7 +54,7 @@ WORKDIR $SCORE_CLIENT_HOME
 ###############################
 # Score Server
 ###############################
-FROM adoptopenjdk/openjdk11:jre-11.0.6_10-alpine as server
+FROM adoptopenjdk/openjdk11:jre-11.0.6_10 as server
 
 # Paths
 ENV SCORE_HOME /score-server
@@ -64,8 +64,8 @@ ENV SCORE_USER score
 ENV SCORE_UID 9999
 ENV SCORE_GID 9999
 
-RUN addgroup -S -g $SCORE_GID $SCORE_USER  \
-    && adduser -S -u $SCORE_UID -G $SCORE_USER $SCORE_USER  \
+RUN addgroup --system --gid $SCORE_GID $SCORE_USER  \
+    && adduser --system --uid $SCORE_UID --ingroup $SCORE_USER $SCORE_USER  \
     && mkdir $SCORE_HOME $SCORE_LOGS \
     && chown -R $SCORE_UID:$SCORE_GID $SCORE_HOME
 

Makefile

@@ -60,7 +60,6 @@ _ping_score_server:
 	@echo $(YELLOW)$(INFO_HEADER) "Pinging score-server on http://localhost:8087" $(END)
 	@$(RETRY_CMD) curl  \
 		-XGET \
-		-H 'Authorization: Bearer f69b726d-d40f-4261-b105-1ec7e6bf04d5' \
 		'http://localhost:8087/download/ping'
 	@echo ""
 
@@ -210,8 +209,8 @@ log-score-server:
 
 # Display logs for score-client
 log-score-client:
-	@echo $(YELLOW)$(INFO_HEADER) "Displaying logs for score-server" $(END)
-	@$(DOCKER_COMPOSE_CMD) logs score-server
+	@echo $(YELLOW)$(INFO_HEADER) "Displaying logs for score-client" $(END)
+	@$(DOCKER_COMPOSE_CMD) logs score-client
 
 
 #############################################################

docker/ego-init/init.sql

@@ -372,9 +372,9 @@ ed5149c4-d8c3-46f8-ab01-b903f82b5fe3	\N	score.TEST-CA
 --
 
 COPY public.token (id, name, owner, issuedate, isrevoked, description, expirydate) FROM stdin;
-f7d708ef-41f8-493f-ad8e-cb0ac97b0688	f69b726d-d40f-4261-b105-1ec7e6bf04d5	c6608c3e-1181-4957-99c4-094493391096	2019-11-20 20:52:08.247	f	\N	2020-11-19 20:52:08.247
-fafaac34-6b01-47ef-9ae6-6d8cb30af5ca	fd0c6c40-254b-4a5f-82e7-cf21a380ccb3	c6608c3e-1181-4957-99c4-094493391096	2019-11-20 20:55:56.186	f	\N	2020-11-19 20:55:56.186
-7df26ca6-801f-4302-a318-6f766d759b1d	1f070fb0-0ee4-4815-8097-b5b065c661cc	c6608c3e-1181-4957-99c4-094493391096	2019-11-20 20:57:38.345	f	\N	2020-11-19 20:57:38.345
+f7d708ef-41f8-493f-ad8e-cb0ac97b0688	f69b726d-d40f-4261-b105-1ec7e6bf04d5	c6608c3e-1181-4957-99c4-094493391096	2023-11-02 20:52:08.247	f	\N	2030-11-02 20:52:08.247
+fafaac34-6b01-47ef-9ae6-6d8cb30af5ca	fd0c6c40-254b-4a5f-82e7-cf21a380ccb3	c6608c3e-1181-4957-99c4-094493391096	2023-11-02 20:55:56.186	f	\N	2030-11-02 20:55:56.186
+7df26ca6-801f-4302-a318-6f766d759b1d	1f070fb0-0ee4-4815-8097-b5b065c661cc	c6608c3e-1181-4957-99c4-094493391096	2023-11-02 20:57:38.345	f	\N	2030-11-02 20:57:38.345
 \.