run isante on platform_2.1.x

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

@@ -6,11 +6,9 @@ on:
   release:
     types: [published]
   push:
-    branches:
-      - "main"
+    branches: [main,'platform_2.1.x']
   pull_request:
-    branches:
-      - "main"
+    branches: [main,'platform_2.1.x']
   workflow_dispatch:
 
 env:
@@ -50,4 +48,4 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=user/app:latest
-          cache-to: type=inline
+          cache-to: type=inline

Dockerfile

@@ -4,7 +4,7 @@ FROM maven:3.6-jdk-8 as download
 
 WORKDIR /
 
-ARG ISANTEPLUS_VERSION=v2.2.1
+ARG ISANTEPLUS_VERSION=platform_2.1.x
 
 RUN git clone --depth 1 --branch $ISANTEPLUS_VERSION https://github.com/IsantePlus/openmrs-distro-isanteplus.git
 
@@ -14,7 +14,7 @@ RUN mvn generate-resources
 
 WORKDIR /db
 
-RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db
+RUN mv /openmrs-distro-isanteplus/package/src/main/resources/openmrs-distro.sql /db/
 
 FROM debian:buster-slim as db
 
@@ -77,7 +77,7 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 5.7
-ENV MYSQL_VERSION 5.7.37-1debian10
+ENV MYSQL_VERSION 5.7.42-1debian10
 
 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list
 
@@ -116,4 +116,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 3306 33060
-CMD ["mysqld"]
+CMD ["mysqld"]