Official Convertigo 8.3.0 release!

[nicolas-albert]

Thx!

[yosifkit]

+arm32v7-Directory: docker/arm32v7
+arm32v7-GitCommit: 19e10c9fe9c26f40b7f9b355a5c4e6e44511bcee
+arm32v7-GitFetch: refs/heads/hotfix

Images must have a single Dockerfile per entry in the library file that can be used for multiple architectures. This means that each supported architecture will have the same FROM line.

- https://github.com/docker-library/official-images/blob/768a4bd403a91b6ebcf00404bab8a4f2b1d36e1e/README.md#multiple-architectures

While the library/ files can specify a different Dockerfile & context per architecture, that functionality is reserved for base images where that is necessary.

It is unfortunate that the newer JDK LTS (eclipse-temurin:21-jdk-jammy) does not currently have an arm32v7 image while the old LTS (eclipse-temurin:17-jdk-jammy) does.

[nicolas-albert]

Sorry to haven't follow this rule.
I can drop the arm32v7 until it supports jdk21 (if it happens).
I'll not move all arch to jdk17.

[github-actions]

Diff for 6fabb71:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 45d7292..e85a97f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,2 @@
 amd64
-arm32v7
 arm64v8
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a910e37..94945db 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Nicolas Albert <[email protected]> (@nicolas-albert), Olivier Picciotto <[email protected]> (@opicciotto)
 GitRepo: https://github.com/convertigo/convertigo
-GitCommit: 24ab4a5de17fd3de5adf1b12c1fa447400be22a0
+GitCommit: b2b3387e1d01034c010817e14de30f2ce60febdc
 
-Tags: 8.2.7, 8.2, latest
-Architectures: amd64, arm32v7, arm64v8
+Tags: 8.3.0, 8.3, latest
+Architectures: amd64, arm64v8
 Directory: docker/default
diff --git a/_bashbrew-list b/_bashbrew-list
index 25a1298..1844919 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,3 +1,3 @@
-convertigo:8.2
-convertigo:8.2.7
+convertigo:8.3
+convertigo:8.3.0
 convertigo:latest
diff --git a/convertigo_latest/Dockerfile b/convertigo_latest/Dockerfile
index ff79afc..08536cd 100644
--- a/convertigo_latest/Dockerfile
+++ b/convertigo_latest/Dockerfile
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see<http://www.gnu.org/licenses/>.
 
-FROM tomcat:9-jdk17-temurin-focal
+FROM tomcat:9-jdk21-temurin-jammy
 
 
 MAINTAINER Nicolas Albert [email protected]
@@ -83,7 +83,7 @@ RUN sed -i.bak \
     && chmod -w conf/* \
     && chmod 777 conf/context.xml conf/server.xml
 
-ENV CONVERTIGO_VERSION 8.2.7
+ENV CONVERTIGO_VERSION 8.3.0
 
 ENV CONVERTIGO_WAR_URL https://github.com/convertigo/convertigo/releases/download/$CONVERTIGO_VERSION/convertigo-$CONVERTIGO_VERSION.war
 
@@ -103,8 +103,6 @@ RUN export GNUPGHOME="$(mktemp -d)" \
     && mkdir /certs && chmod 777 /certs \
     && (cd webapps/convertigo \
         && unzip -q /tmp/convertigo.war \
-        && (chmod -f a+x WEB-INF/xvnc/* || true) \
-        && (test "$(dpkg --print-architecture)" != "i386" && rm -rf WEB-INF/xulrunner WEB-INF/xvnc WEB-INF/lib/swt_* || true) \
         && chmod 777 WEB-INF/web.xml WEB-INF/lib WEB-INF/classes \
         && rm -rf /tmp/*)
 
diff --git a/convertigo_latest/docker-entrypoint.sh b/convertigo_latest/docker-entrypoint.sh
index 958c3f6..e749ba8 100755
--- a/convertigo_latest/docker-entrypoint.sh
+++ b/convertigo_latest/docker-entrypoint.sh
@@ -97,16 +97,6 @@ if [ "$1" = "convertigo" ]; then
         -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \
         -Dconvertigo.cems.user_workspace_path=/workspace"
     
-    ## the web-connector version can use an existing DISPLAY or declare one
-    ## the mbaas version need to be headless and remove the DISPLAY variable
-    
-    if [ -d $WEB_INF/xvnc ]; then
-        export DISPLAY=${DISPLAY:-:0}
-        echo "Set DISPLAY=${DISPLAY}"
-    else
-        unset DISPLAY
-    fi
-    
     if [ "$COOKIE_PATH" != "" ]; then
         (TMPSED=`sed -e "s,sessionCookiePath=\"[^\"]*\",sessionCookiePath=\"$COOKIE_PATH\"," $CATALINA_HOME/conf/context.xml` && \
             echo "$TMPSED" > $CATALINA_HOME/conf/context.xml)

Relevant Maintainers:

• convertigo: @nicolas-albert @opicciotto