update dockerfiles

- define user uid/gid
- use new geedeecee files (hopefully means smaller images, faster building)

modules/events-server/docker/Dockerfile

@@ -2,24 +2,23 @@
 
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
-ARG DIST_DIR="../build/distributions/"
+ARG APP_FILES="build/"
+ARG USER_ID=1000
+ARG USER_GID=1000
 
-WORKDIR /app
+USER $USER_ID:$USER_GID
 
-ENV SERVER_PORT=8080
-EXPOSE $SERVER_PORT
+ENV SERVER_DATA_DIR="/app/data" \
+    KAFKA_STREAMS_STATE_DIR="/app/state/kafka" \
+    SERVER_PORT=8080 \
+    SOCKET_SERVER_PORT=9002
 
-ENV SOCKET_SERVER_PORT=9002
-EXPOSE $SOCKET_SERVER_PORT
+EXPOSE $SERVER_PORT \
+       $SOCKET_SERVER_PORT
 
-ENV SERVER_DATA_DIR="/app/data"
-ENV KAFKA_STREAMS_STATE_DIR="/app/state/kafka"
 VOLUME ${SERVER_DATA_DIR} \
        ${KAFKA_STREAMS_STATE_DIR}
 
-COPY ${DIST_DIR}/events-server-${KAFKATORIO_VERSION}.tar events-server.tar
+COPY ${APP_FILES} /app/
 
-RUN tar -xf events-server.tar --strip-components=1 \
- && rm events-server.tar
-
-ENTRYPOINT /app/bin/events-server
+ENTRYPOINT /app/bin/run

modules/events-server/docker/docker-compose.yml

@@ -7,12 +7,11 @@ services:
     container_name: ${APP_NAME}
     restart: unless-stopped
     build:
-      context: ..
-      dockerfile: ./docker/Dockerfile
+      context: .
+      dockerfile: Dockerfile
       args:
         KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
-        DIST_DIR: "./build/distributions/"
-        APP_NAME: ${APP_NAME}
+        APP_FILES: "./build/"
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""