Dockerfile

@@ -4,9 +4,7 @@
 # https://github.com/obiba/docker-agate
 #
 
-FROM tianon/gosu:latest AS gosu
-
-FROM docker.io/library/eclipse-temurin:21-jre AS server-released
+FROM docker.io/library/eclipse-temurin:21-jre-noble AS server-released
 
 LABEL OBiBa <dev@obiba.org>
 
@@ -18,15 +16,17 @@ ENV AGATE_ADMINISTRATOR_PASSWORD=password
 ENV AGATE_HOME=/srv
 ENV JAVA_OPTS=-Xmx2G
 
-ENV AGATE_VERSION 3.0.2
+ENV AGATE_VERSION 3.4.0
 
 # Install Agate Python Client
 RUN \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https unzip curl python3-pip libcurl4-openssl-dev libssl-dev
+  DEBIAN_FRONTEND=noninteractive apt-get install -y gosu apt-transport-https unzip curl python3-pip libcurl4-openssl-dev libssl-dev && \
+  apt-get clean &&  \
+  rm -rf /var/lib/apt/lists/*
 
-RUN pip install obiba-agate
+RUN pip install --break-system-packages obiba-agate
 
 # Install Agate Server
 RUN set -x && \
@@ -36,15 +36,20 @@ RUN set -x && \
   rm agate.zip && \
   mv agate-${AGATE_VERSION} agate
 
-COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/
-
 RUN chmod +x /usr/share/agate/bin/agate
 
 COPY ./bin /opt/agate/bin
 
-RUN chmod +x -R /opt/agate/bin
-RUN adduser --system --home $AGATE_HOME --no-create-home --disabled-password agate
-RUN chown -R agate /opt/agate
+RUN groupadd --system --gid 10041 agate && \
+  useradd --system --home $AGATE_HOME --no-create-home --uid 10041 --gid agate agate; \
+  chmod +x -R /opt/agate/bin && \
+  chown -R agate /opt/agate
+
+# Clean up
+RUN apt remove -y unzip wget curl && \
+  apt autoremove -y && \
+  apt clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/*
 
 VOLUME /srv
 

Makefile

@@ -2,17 +2,11 @@
 # Docker helper
 #
 
-no_cache=false
-
-all:
-	sudo docker build --no-cache=true -t="obiba/agate:$(tag)" . && \
-		sudo docker build -t="obiba/agate:latest" . && \
-		sudo docker image push obiba/agate:$(tag) && \
-		sudo docker image push obiba/agate:latest
+no_cache=true
 
 # Build Docker image
 build:
-	sudo docker build --no-cache=$(no_cache) -t="obiba/agate:$(tag)" .
+	docker build --pull --no-cache=$(no_cache) -t="obiba/agate:$(tag)" .
 
 push:
-	sudo docker image push obiba/agate:$(tag)
+	docker image push obiba/agate:$(tag)

bin/first_run.sh

@@ -18,8 +18,8 @@ cat $AGATE_HOME/conf/shiro.ini | sed -e "s,^administrator\s*=.*\,,administrator=
 # Configure MongoDB
 if [ -n "$MONGODB_URI" ]
 then
-	sed s,localhost:27017/agate,$MONGODB_URI,g $AGATE_HOME/conf/application.yml > /tmp/application.yml
-	mv -f /tmp/application.yml $AGATE_HOME/conf/application.yml
+	sed s,localhost:27017/agate,$MONGODB_URI,g $AGATE_HOME/conf/application-prod.yml > /tmp/application-prod.yml
+	mv -f /tmp/application-prod.yml $AGATE_HOME/conf/application-prod.yml
 elif [ -n "$MONGO_HOST" ]
 	then
   MGP=27017
@@ -39,14 +39,14 @@ elif [ -n "$MONGO_HOST" ]
 	else
 		MGURI="$MGURI/$MGDB"
 	fi
-	sed s,localhost:27017/agate,$MGURI,g $AGATE_HOME/conf/application.yml > /tmp/application.yml
-	mv -f /tmp/application.yml $AGATE_HOME/conf/application.yml
+	sed s,localhost:27017/agate,$MGURI,g $AGATE_HOME/conf/application-prod.yml > /tmp/application-prod.yml
+	mv -f /tmp/application-prod.yml $AGATE_HOME/conf/application-prod.yml
 fi
 
 # Configure ReCaptcha
 if [ -n "$RECAPTCHA_SITE_KEY" -a -n "$RECAPTCHA_SECRET_KEY" ]
 	then
-	sed s/secret:\ 6Lfo7gYT.*/secret:\ $RECAPTCHA_SECRET_KEY/ $AGATE_HOME/conf/application.yml | \
-	sed s/reCaptchaKey:.*/reCaptchaKey:\ $RECAPTCHA_SITE_KEY/ > /tmp/application.yml
-	mv -f /tmp/application.yml $AGATE_HOME/conf/application.yml
+	sed s/secret:\ 6Lfo7gYT.*/secret:\ $RECAPTCHA_SECRET_KEY/ $AGATE_HOME/conf/application-prod.yml | \
+	sed s/reCaptchaKey:.*/reCaptchaKey:\ $RECAPTCHA_SITE_KEY/ > /tmp/application-prod.yml
+	mv -f /tmp/application-prod.yml $AGATE_HOME/conf/application-prod.yml
 fi

bin/start.sh

@@ -16,8 +16,19 @@ if [ ! -d $AGATE_HOME/conf ]
 		mkdir -p $AGATE_HOME/conf
 		cp -r /usr/share/agate/conf/* $AGATE_HOME/conf
 		# So that application is accessible from outside of docker
-		sed s/address:\ localhost//g $AGATE_HOME/conf/application.yml > /tmp/application.yml && \
-	    mv /tmp/application.yml $AGATE_HOME/conf/application.yml
+		sed s/address:\ localhost//g $AGATE_HOME/conf/application-prod.yml > /tmp/application-prod.yml && \
+	    mv /tmp/application-prod.yml $AGATE_HOME/conf/application-prod.yml
+fi
+
+# Upgrade configuration
+if [[ -f $AGATE_HOME/conf/application.yml && ! -f $AGATE_HOME/conf/application-prod.yml ]]
+	then
+	if grep -q "profiles:" $AGATE_HOME/conf/application.yml
+		then
+			cp $AGATE_HOME/conf/application.yml $AGATE_HOME/conf/application.yml.2.x
+			cat $AGATE_HOME/conf/application.yml.2.x | grep -v "profiles:" > $AGATE_HOME/conf/application.yml
+	fi
+	mv -f $AGATE_HOME/conf/application.yml $AGATE_HOME/conf/application-prod.yml
 fi
 
 # Check if 1st run. Then configure application.
@@ -27,24 +38,5 @@ if [ -e /opt/agate/bin/first_run.sh ]
   	mv /opt/agate/bin/first_run.sh /opt/agate/bin/first_run.sh.done
 fi
 
-# Upgrade to 3.x
-if [ -e $AGATE_HOME/conf/application.yml ]
-	then
-		if grep -q "profiles:" $AGATE_HOME/conf/application.yml
-			then
-				cp $AGATE_HOME/conf/application.yml $AGATE_HOME/conf/application.yml.2.x
-				cat $AGATE_HOME/conf/application.yml.2.x | grep -v "profiles:" > $AGATE_HOME/conf/application.yml
-		fi
-fi
-
-# Wait for MongoDB to be ready
-if [ -n "$MONGO_HOST" ]
-	then
-	until curl -i http://$MONGO_HOST:$MONGO_PORT/agate &> /dev/null
-	do
-  		sleep 1
-	done
-fi
-
 # Start agate
 /usr/share/agate/bin/agate

docker-compose.yml

@@ -1,6 +1,7 @@
 services:
         agate:
-                image: obiba/agate
+                image: obiba/agate:latest
+                #image: obiba/agate:test
                 ports:
                         - "8881:8081"
                 links:
@@ -17,7 +18,7 @@ services:
                 volumes:
                         - /tmp/agate:/srv
         mongo:
-                image: mongo:6.0
+                image: mongo
                 environment:
                         - MONGO_INITDB_ROOT_USERNAME=${MONGO_USER:-obiba}
                         - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD:-password}

docker-entrypoint.sh

@@ -2,8 +2,7 @@
 set -e
 
 if [ "$1" = 'app' ]; then
-    chown -R agate "$AGATE_HOME"
-
+    chown -R agate:agate "$AGATE_HOME"
     exec gosu agate /opt/agate/bin/start.sh
 fi