Official Convertigo 8.3.3 release!

[nicolas-albert]

Thx!

[nicolas-albert]

I did the PR before publishing the release public on GH!
Sorry :'(

[tianon]

Instead of `sudo`, I would suggest using `setpriv` (which is more similar in operation to `gosu` and less of a potential security risk than having `sudo` in the image, and probably already installed in the image).

[github-actions]

Diff for b6a16de:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 916e588..b1abe13 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Nicolas Albert <nicolasa@convertigo.com> (@nicolas-albert), Olivier Picciotto <olivier.picciotto@convertigo.com> (@opicciotto)
 GitRepo: https://github.com/convertigo/convertigo
-GitCommit: 229c009b525e364cff964979567f43d372efa9e0
+GitCommit: 2bf449e3e732b0b9fa9cec03aa09202494e82325
 
-Tags: 8.3.2, 8.3, latest
+Tags: 8.3.3, 8.3, latest
 Architectures: amd64, arm64v8
 Directory: docker/default
diff --git a/_bashbrew-list b/_bashbrew-list
index 38f3620..f3d34a8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,3 +1,3 @@
 convertigo:8.3
-convertigo:8.3.2
+convertigo:8.3.3
 convertigo:latest
diff --git a/convertigo_latest/Dockerfile b/convertigo_latest/Dockerfile
index 87b1817..bacaa29 100644
--- a/convertigo_latest/Dockerfile
+++ b/convertigo_latest/Dockerfile
@@ -31,7 +31,6 @@ RUN apt-get update -y \
     curl \
     dirmngr \
     gnupg \
-    gosu \
     sudo \
     tini \
     unzip \
@@ -83,7 +82,7 @@ RUN sed -i.bak \
     && chmod -w conf/* \
     && chmod 777 conf/context.xml conf/server.xml
 
-ENV CONVERTIGO_VERSION 8.3.2
+ENV CONVERTIGO_VERSION 8.3.3
 
 ENV CONVERTIGO_WAR_URL https://github.com/convertigo/convertigo/releases/download/$CONVERTIGO_VERSION/convertigo-$CONVERTIGO_VERSION.war
 
diff --git a/convertigo_latest/docker-entrypoint.sh b/convertigo_latest/docker-entrypoint.sh
index e749ba8..11768fb 100755
--- a/convertigo_latest/docker-entrypoint.sh
+++ b/convertigo_latest/docker-entrypoint.sh
@@ -13,22 +13,38 @@ if [ "$1" = "convertigo" ]; then
     ## if needed, force the admin and testplatform accounts
     
     if [ "$CONVERTIGO_ADMIN_USER" != "" ]; then
+        if ! grep -q '^admin\.username=' /workspace/configuration/engine.properties 2>/dev/null; then
             export JAVA_OPTS="-Dconvertigo.engine.admin.username=$CONVERTIGO_ADMIN_USER $JAVA_OPTS"
+        else
+            echo 'Ignore $CONVERTIGO_ADMIN_USER because /workspace/configuration/engine.properties defines admin.username' 
+        fi
         unset CONVERTIGO_ADMIN_USER
     fi
     
     if [ "$CONVERTIGO_ADMIN_PASSWORD" != "" ]; then
+        if ! grep -q '^admin\.password=' /workspace/configuration/engine.properties 2>/dev/null; then
             export JAVA_OPTS="-Dconvertigo.engine.admin.password=$(toHash $CONVERTIGO_ADMIN_PASSWORD) $JAVA_OPTS"
+        else
+            echo 'Ignore $CONVERTIGO_ADMIN_PASSWORD because /workspace/configuration/engine.properties defines admin.password' 
+        fi
         unset CONVERTIGO_ADMIN_PASSWORD
     fi
     
     if [ "$CONVERTIGO_TESTPLATFORM_USER" != "" ]; then
+        if ! grep -q '^testplatform\.username=' /workspace/configuration/engine.properties 2>/dev/null; then
             export JAVA_OPTS="-Dconvertigo.engine.testplatform.username=$CONVERTIGO_TESTPLATFORM_USER $JAVA_OPTS"
+        else
+            echo 'Ignore $CONVERTIGO_TESTPLATFORM_USER because /workspace/configuration/engine.properties defines testplatform.username' 
+        fi
         unset CONVERTIGO_TESTPLATFORM_USER
     fi
     
     if [ "$CONVERTIGO_TESTPLATFORM_PASSWORD" != "" ]; then
+        if ! grep -q '^testplatform\.password=' /workspace/configuration/engine.properties 2>/dev/null; then
             export JAVA_OPTS="-Dconvertigo.engine.testplatform.password=$(toHash $CONVERTIGO_TESTPLATFORM_PASSWORD) $JAVA_OPTS"
+        else
+            echo 'Ignore $CONVERTIGO_TESTPLATFORM_PASSWORD because /workspace/configuration/engine.properties define testplatform.password' 
+        fi
         unset CONVERTIGO_TESTPLATFORM_PASSWORD
     fi
     
@@ -192,7 +208,8 @@ if [ "$1" = "convertigo" ]; then
     
     
     if [ $(id -u) = "0" ]; then
-        exec gosu convertigo $CATALINA_HOME/bin/catalina.sh run
+        chown -Lf convertigo:convertigo /workspace
+        exec setpriv --reuid=convertigo --regid=convertigo --init-groups $CATALINA_HOME/bin/catalina.sh run
     else
         exec $CATALINA_HOME/bin/catalina.sh run
     fi

Relevant Maintainers:

• convertigo: @nicolas-albert @opicciotto