Merge remote-tracking branch 'origin/stable'

taigaio · Feb 19, 2024 · 469130c · 469130c
2 parents 207f1ff + c3f5b80
commit 469130c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - ...
 
+## 6.7.4 (2024-02-19)
+
+* Docker: fix a typo in the template for generate the config.json file.
+
 ## 6.7.3 (2024-02-19)
 
 * Docker: GitHub no longer supports subversion, change plugins setup system.

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -18,9 +18,9 @@ RUN set -eux; \
     apk add \
        bash; \
     # Install taiga-front core
-    wget https://github.com/kaleidos-ventures/taiga-front-dist/archive/6.7.3.zip -O source.zip; \
+    wget https://github.com/kaleidos-ventures/taiga-front-dist/archive/6.7.4.zip -O source.zip; \
     unzip source.zip; \
-    mv /taiga-front-dist-6.7.3 /taiga; \
+    mv /taiga-front-dist-6.7.4 /taiga; \
     mv /conf.json.template taiga/dist/; \
     chmod +x /docker-entrypoint.d/30_config_env_subst.sh; \
     # Install taiga-front contribs

diff --git a/docker/conf.json.template b/docker/conf.json.template
@@ -7,7 +7,7 @@
     "eventsReconnectTryInterval": 10000,
     "debug": ${DEBUG},
     "debugInfo": ${DEBUG},
-    "defaultLanguage": "${DEFAULT_LANGUAGE}"
+    "defaultLanguage": "${DEFAULT_LANGUAGE}",
     "themes": ["taiga"],
     "defaultTheme": "taiga",
     "defaultLoginEnabled": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TaigaIO",
-  "version": "6.7.3",
+  "version": "6.7.4",
   "description": "Taiga project management system (frontend)",
   "main": "index.js",
   "keywords": [