Merge branch 'develop'

Author: rmunn

.github/workflows/integrate-and-deploy.yml

@@ -50,9 +50,9 @@ jobs:
       -
         name: Check unit tests
         run: make unit-tests-ci
-      -
-        name: Check e2e tests
-        run: make e2e-tests-ci
+      # -
+      #   name: Check e2e tests
+      #   run: make e2e-tests-ci
       -
         name: Log in to Docker Hub
         uses: docker/login-action@v1

.github/workflows/production.yml

@@ -13,7 +13,7 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#jobsjob_iduses
     uses: sillsdev/web-languageforge/.github/workflows/integrate-and-deploy.yml@master
     with:
-      image-tag: $(echo ${{ github.ref }} | sed 's/refs\/tags\///')
+      image-tag: $(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idsecrets
     secrets:
       kube-context: ${{ secrets.LTOPS_K8S_PRODUCTION_CONTEXT }}

docker/Makefile

@@ -18,8 +18,7 @@ e2e-tests:
 .PHONY: e2e-tests-ci
 e2e-tests-ci:
 	docker-compose build app-for-e2e test-e2e
-    # "-" means continue running commands even if they error (failed tests)
-	-docker-compose run -e GITHUB_ACTIONS=1 --name e2etests test-e2e
+	docker-compose run -e GITHUB_ACTIONS=1 --name e2etests test-e2e
 	docker cp e2etests:/data/e2e-output/junitresults.xml e2e-results.xml
 	docker rm e2etests
 

docker/app/000-default.conf renamed to docker/base-php/000-default.conf

@@ -24,8 +24,8 @@ RUN curl -L http://linux.lsdev.sil.org/downloads/sil-testing.gpg | apt-key add -
 && apt-get update \
 && apt-get install --yes --no-install-recommends python lfmerge rsyslog logrotate iputils-ping \
 && rm -rf /var/lib/apt/lists/*
-COPY docker/app/lfmerge.conf /etc/languageforge/conf/sendreceive.conf
-COPY docker/app/lfmergeqm-background.sh /
+COPY docker/base-php/lfmerge.conf /etc/languageforge/conf/sendreceive.conf
+COPY docker/base-php/lfmergeqm-background.sh /
 RUN adduser www-data fieldworks \
 && chown -R www-data:www-data /var/lib/languageforge \
 && chmod 0755 /var/lib/languageforge \
@@ -36,8 +36,8 @@ RUN adduser www-data fieldworks \
 RUN sed -i '/load="imklog"/s/^/#/' /etc/rsyslog.conf
 
 # php customizations
-COPY docker/app/customizations.php.ini $PHP_INI_DIR/conf.d/
+COPY docker/base-php/customizations.php.ini $PHP_INI_DIR/conf.d/
 
 # apache2 customizations
 RUN a2enmod headers rewrite
-COPY docker/app/000-default.conf /etc/apache2/sites-enabled
+COPY docker/base-php/000-default.conf /etc/apache2/sites-enabled

docker/base-php/Dockerfile

@@ -377,7 +377,7 @@ export class LexiconEditorController implements angular.IController {
       const pristineEntryForDiffing = this.removeCustomFieldsForDeltaUpdate(this.prepEntryForUpdate(this.pristineEntry));
       const diffForUpdate = isNewEntry ? undefined : {
         id: entryForUpdate.id,
-        _update_deep_diff: diff(pristineEntryForDiffing, entryForDiffing)
+        _update_deep_diff: diff(LexiconEditorController.normalizeStrings(pristineEntryForDiffing), entryForDiffing)
       };
       let entryOrDiff = isNewEntry ? entryForUpdate : diffForUpdate;
       if (!isNewEntry && this.hasArrayChange(diffForUpdate._update_deep_diff)) {