diff --git a/Dockerfile b/Dockerfile index 9f10de0c5..6843cde64 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,25 +12,11 @@ RUN mvn clean package -Dmaven.test.skip=true -P $opensrp_maven_package_profiles WORKDIR /tmp/opensrp-server-web-exploded RUN jar -xvf /tmp/opensrp-server-web/target/opensrp.war -FROM tomcat:9-jre11-openjdk-slim +FROM tomcat:9-jdk11-corretto # Copy the exploded directory COPY --from=build /tmp/opensrp-server-web-exploded /usr/local/tomcat/webapps/opensrp -# copy the migration files -COPY --from=build /tmp/opensrp-server-web/configs/assets/migrations /migrations - -# Download mybatis -RUN apt update && apt install -y unzip wget - -# setup mybatis -RUN mkdir -p /opt/mybatis \ - && wget --quiet --no-cookies https://github.com/mybatis/migrations/releases/download/mybatis-migrations-3.3.4/mybatis-migrations-3.3.4-bundle.zip -O /opt/mybatis/mybatis-migrations-3.3.4.zip \ - && unzip /opt/mybatis/mybatis-migrations-3.3.4.zip -d /opt/mybatis/ \ - && rm -f /opt/mybatis/mybatis-migrations-3.3.4.zip \ - && chmod +x /opt/mybatis/mybatis-migrations-3.3.4/bin/migrate - -# Run migrations (mybatis) -# RUN /opt/mybatis/mybatis-migrations-3.3.4/bin/migrate up --path=/migrations --env=deployment +RUN yum update -y EXPOSE 8080 # Start app diff --git a/configs b/configs index 16478fed3..c3b715d4e 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 16478fed3b976566d4e8ff8f06271420748599e5 +Subproject commit c3b715d4eba79bca22ea7e87a633ebe8655d3c86 diff --git a/pom.xml b/pom.xml index 9bb69b978..ec55613b0 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ opensrp-server-web war - 2.9.6-SNAPSHOT + 2.10.0-SNAPSHOT opensrp-server-web OpenSRP Server Web Application https://github.com/OpenSRP/opensrp-server-web @@ -24,7 +24,7 @@ 3.8.0 always 1.5.1 - 2.13.4-SNAPSHOT + 2.14.0-SNAPSHOT 2.4.1-SNAPSHOT 2.0.1-SNAPSHOT 2.0.5 @@ -431,6 +431,14 @@ configs/assets/config + + configs/assets/migrations/environments + mybatis/environments + + + configs/assets/migrations/scripts + mybatis/scripts + configs/build true