Changes in [1712:f63a888473e3:1703:367ae3da4f20] in digilib (mirror)

Files:

• README.md (modified) (2 diffs)
• build/docker/Dockerfile (modified) (2 diffs)
• build/docker/README.md (deleted)
• build/docker/entrypoint.sh (deleted)

README.md

@@ -31 +31 @@
 * [Source code](https://github.com/robcast/digilib)
 * [Issue tracker](https://github.com/robcast/digilib/issues)
-* [Docker images](https://hub.docker.com/r/robcast/digilib)
 * Daily built [WAR files](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/)
 * Daily built [Javadoc](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/javadoc/)
@@ -60 +59 @@
    `mvn jetty:run-exploded --projects webapp`
    
-   and open http://localhost:8080/digilib/digilib.html in your browser.
+   and watch digilib at http://localhost:8080/digilib/digilib.html
 
 or follow the build and install instructions on the [documentation pages](https://robcast.github.io/digilib/).

build/docker/Dockerfile

@@ -3 +3 @@
 WORKDIR /usr/src/digilib
 COPY . /usr/src/digilib/
-ARG MVN_ARGS
-# build digilib using maven
-RUN mvn $MVN_ARGS package
+RUN mvn package
 # remove the war file so we don't copy it in the next stage
 RUN rm /usr/src/digilib/webapp/target/digilib-webapp-*.war
@@ -11 +9 @@
 # runnable container stage
 FROM tomcat:9-jre11 AS runstage
-# copy entry script
-COPY build/docker/entrypoint.sh /entrypoint.sh
-# remove tomcat default webapps and set entrypoint
-RUN rm -r /usr/local/tomcat/webapps/* \
-        && chmod 755 /entrypoint.sh
+# remove tomcat default webapps
+RUN rm -r /usr/local/tomcat/webapps/*
 # copy digilib from build image
 COPY --from=buildstage /usr/src/digilib/webapp/target/digilib-webapp-* /usr/local/tomcat/webapps/digilib/
-
-ENTRYPOINT ["/entrypoint.sh"]