get docker version working

Author: artntek

docker/Dockerfile

@@ -2,14 +2,16 @@
 ## NOTE: Must be run from the root of the project,
 ## otherwise the war file COPY command will not work!
 ##
-FROM tomee:9-jre17-Temurin-ubuntu-webprofile
+FROM tomee:10-jre21-Temurin-ubuntu-webprofile
 
-ARG TAG=1.0.0-SNAPSHOT
+ARG TAG="NO-TAG"
 ARG NS_VERSION=${TAG}
+ARG UID=56700
+ARG GID=56700
 
 WORKDIR /usr/local/tomee
 
-RUN groupadd -g 1000 notifier && useradd -u 1000 -g 1000 notifier
+RUN groupadd -g $GID notifier && useradd -u $UID -g $GID notifier
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -23,11 +25,11 @@ RUN apt-get update \
     telnet            \
     vim
 
-COPY ../target/notification-service-${NS_VERSION}.war ./webapps/notifications.war
+COPY ./target/notification-service-${NS_VERSION}.war ./webapps/notifications.war
 
 RUN chown -R notifier:notifier .
 
-USER 1000
+USER $UID
 
 # metadata
 LABEL org.opencontainers.image.title="Notifications"

docker/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   webapp:
-    image: ghcr.io/dataoneorg/notification-service:DEVELOP
+    image: ghcr.io/dataoneorg/notification-service:develop
     ports:
       - "8080:8080"
 

src/main/resources/properties.yaml

@@ -4,8 +4,8 @@ database:
   password: notifications_password
   name: notifications
   version: 16.0
-  #  jdbcUrl: jdbc:postgresql://host.docker.internal:5432/notifications    # for docker-compose
-  jdbcUrl: jdbc:postgresql://localhost:5432/notifications                # for local development
+  jdbcUrl: jdbc:postgresql://host.docker.internal:5432/notifications    # for docker-compose
+#  jdbcUrl: jdbc:postgresql://localhost:5432/notifications                # for local development
   #  jdbcUrl: jdbc:postgresql://ns-postgresql-hl:5432/notifications        # for k8s
 
   ##  See HikariCP configuration options at: