Merge branch 'develop'

Author: billy clark

.vscode/extensions.json

@@ -2,7 +2,7 @@
 	// See http://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"juancasanova.awesometypescriptproblemmatcher",
+		"amodio.tsl-problem-matcher",
 		"msjsdiag.debugger-for-chrome",
 		"ms-vscode-remote.remote-containers",
 		"editorconfig.editorconfig",

docker/app/Dockerfile

@@ -60,6 +60,7 @@ RUN install-php-extensions xdebug
 COPY docker/app/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d
 RUN mv $PHP_INI_DIR/php.ini-development $PHP_INI_DIR/php.ini
 COPY --from=sillsdev/web-languageforge:wait-latest /wait /wait
+COPY docker/app/run-with-wait.sh /run-with-wait.sh
 
 FROM ${ENVIRONMENT}-app AS languageforge-app
 ARG BUILD_VERSION=${BUILD_VERSION:-'9.9.9'}
@@ -82,6 +83,7 @@ COPY docker/app/symfony-exceptions.patch /
 RUN patch -p4 -i /symfony-exceptions.patch
 
 RUN echo "${BUILD_VERSION}" > /var/www/html/build-version.txt \
- && sed -i /var/www/html/version.php -e "s/^\\(define('VERSION', '\\).*;\$/\\1${BUILD_VERSION}'\\);/"
+    && sed -i /var/www/html/version.php -e "s/^\\(define('VERSION', '\\).*;\$/\\1${BUILD_VERSION}'\\);/"
 
+ENTRYPOINT [ "tini", "-g", "--" ]
 CMD [ "apache2-foreground" ]

docker/app/run-with-wait.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+trap "exit" TERM
+/wait
+apache2-foreground

docker/base-php/Dockerfile

@@ -4,7 +4,7 @@ FROM php:7.3.28-apache
 # p7zip-full - used by LF application for unzipping lexicon uploads
 # unzip - used by LF application for unzipping lexicon uploads
 # curl - used by LF application
-RUN apt-get update && apt-get -y install p7zip-full unzip curl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get -y install p7zip-full unzip curl tini && rm -rf /var/lib/apt/lists/*
 
 # see https://github.com/mlocati/docker-php-extension-installer
 # PHP extensions required by the LF application

docker/docker-compose.yml

@@ -54,7 +54,7 @@ services:
       - FACEBOOK_CLIENT_SECRET=bogus-development-token
       - REMEMBER_ME_SECRET=bogus-development-key
       - LANGUAGE_DEPOT_API_TOKEN=bogus-development-token
-    command: sh -c "/wait && apache2-foreground"
+    command: ["/run-with-wait.sh"]
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
@@ -310,6 +310,7 @@ services:
     depends_on:
       - db
       - mail
+      - ld-api
     ports:
       - 3238:80
     environment:

docker/lfmerge/Dockerfile

@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.120
+FROM ghcr.io/sillsdev/lfmerge:2.0.123
 # Do not add anything to this Dockerfile, it should stay empty

docker/next-app/Dockerfile.next-app

@@ -3,7 +3,7 @@ FROM node:alpine AS builder
 
 WORKDIR /app
 
-COPY jsconfig.json package-lock.json package.json postcss.config.cjs svelte.config.js tailwind.config.cjs /app
+COPY jsconfig.json package-lock.json package.json postcss.config.cjs svelte.config.js tailwind.config.cjs /app/
 COPY src /app/src
 COPY static /app/static
 

docs/RELEASE.md

@@ -6,7 +6,7 @@ This guide describes our Release and Deployment processes.
 
 The Language Forge project is under active development and as a project team we value shipping early and shipping often.  In the past we have used a form of semantic versioning for our version names, however moving forward our releases will be [publicized on our community support site](https://community.software.sil.org/c/language-forge/20) as the YYYY-MM release. We will publish a summary of changes on our community site, once a month for all releases/changes that occurred during the prior month.
 
-Releases are tagged in Git using the naming convention `vYYYYMMDD` and Docker images as `YYYYMMDD` (omitting the preceding `v`).  In the event that we release twice in a single day, the release shall be named `YYYYMMDDb`, containing a distinguishing trailing letter.
+Releases are tagged in Git using the naming convention `vYYYY-MM-DD` and Docker images as `YYYY-MM-DD` (omitting the preceding `v`).  In the event that we release twice in a single day, the release shall be named `YYYY-MM-DDb`, containing a distinguishing trailing letter.
 ## Application deployment ##
 
 Language Forge is built to run in a containerized environment.  Kubernetes is our chosen runtime platform for production.  Deployments are automated under the right circumstances using GitHub Actions.
@@ -29,7 +29,7 @@ Production deployments can be manually run with `VERSION_APP=<some-docker-tag-or
 
 Current workflow:
 1. merge from `develop` into `master`
-1. "Draft a new release" on https://github.com/sillsdev/web-languageforge/releases with a `v#.#.#` tag format
+1. "Draft a new release" on https://github.com/sillsdev/web-languageforge/releases with a `vYYYY-MM-DD` tag format
 1. "Publish" the new release
 1. this will kick off the GHA (`.github/workflows/production.yml`) to build, test and publish the necessary images to Docker Hub (https://hub.docker.com/r/sillsdev/web-languageforge/tags) and deploy this code to the production environment at https://languageforge.org