From b4642fcbf61b0f8ebdd187c04ba006fd904cc2f5 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 18 Dec 2023 09:22:31 +0300 Subject: [PATCH 1/2] WoozyMasta/archimate-ci-image#18, WoozyMasta/archimate-ci-image#20 Update Archi to 5.2.0, add UTF-8 support --- Dockerfile | 3 ++- Dockerfile.rootless | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b40ff14..cd1f5ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y \ ca-certificates \ + language-pack-en-base \ libgtk2.0-cil \ libswt-gtk-4-jni \ dbus-x11 \ @@ -30,7 +31,7 @@ ARG ARCHI_VERSION=5.0.2 # Download & extract Archimate tool RUN set -eux; \ curl -#Lo archi.tgz \ - "https://www.archimatetool.com/downloads/archi.php?/$ARCHI_VERSION/Archi-Linux64-$ARCHI_VERSION.tgz"; \ + "https://www.archimatetool.com/downloads/archi-5.php?/$ARCHI_VERSION/Archi-Linux64-$ARCHI_VERSION.tgz"; \ tar zxf archi.tgz -C /opt/; \ rm archi.tgz; \ chmod +x /opt/Archi/Archi; \ diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 79979fb..13e21dc 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ ARG ARCHIMATE_CI_IMAGE=ghcr.io/woozymasta/archimate-ci-image -ARG ARCHIMATE_CI_VERSION=5.0.2-1.0.4 +ARG ARCHIMATE_CI_VERSION=5.2.0 FROM $ARCHIMATE_CI_IMAGE:$ARCHIMATE_CI_VERSION AS base From ea891ea8fa4dd84e998fe2ffba1a20a57b3684a0 Mon Sep 17 00:00:00 2001 From: Pavel Alexeev Date: Mon, 18 Dec 2023 09:34:58 +0300 Subject: [PATCH 2/2] WoozyMasta/archimate-ci-image#18, WoozyMasta/archimate-ci-image#20 UTF-8 by default --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index cd1f5ae..cc44116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,8 @@ RUN set -eux; \ update-ca-certificates; \ rm -rf /var/lib/apt/lists/* +ENV LANG=en_US.UTF-8 + FROM base AS archi ARG ARCHI_VERSION=5.0.2