Merge pull request #557 from Naramsim/fix_images

Upgrade Docker images and fixes digest

docker/frontend-apps/Dockerfile

@@ -1,4 +1,5 @@
-FROM jetty:alpine
+# https://hub.docker.com/layers/jetty/library/jetty/9.4.46-jdk11-alpine-eclipse-temurin/images/sha256-dcaab143043b8916675f8533700c07310986e94db9ee4f2f6bf336e8befc53e9?context=explore
+FROM jetty@sha256:dcaab143043b8916675f8533700c07310986e94db9ee4f2f6bf336e8befc53e9
 
 LABEL maintainer="[email protected]"
 

docker/frontend-bugs/Dockerfile

@@ -1,4 +1,5 @@
-FROM jetty:alpine
+# https://hub.docker.com/layers/jetty/library/jetty/9.4.46-jdk11-alpine-eclipse-temurin/images/sha256-dcaab143043b8916675f8533700c07310986e94db9ee4f2f6bf336e8befc53e9?context=explore
+FROM jetty@sha256:dcaab143043b8916675f8533700c07310986e94db9ee4f2f6bf336e8befc53e9
 
 LABEL maintainer="[email protected]"
 

docker/kb-importer/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:11-jre-slim
+# https://hub.docker.com/layers/library/eclipse-temurin/11.0.16.1_1-jre/images/sha256-ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106?context=explore
+FROM eclipse-temurin@sha256:ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106
 
 LABEL maintainer="[email protected]"
 

docker/patch-lib-analyzer/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:11-jre-slim
+# https://hub.docker.com/layers/library/eclipse-temurin/11.0.16.1_1-jre/images/sha256-ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106?context=explore
+FROM eclipse-temurin@sha256:ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106
 
 LABEL maintainer="[email protected]"
 
@@ -10,9 +11,9 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 
-COPY patch-lib-analyzer-${VULAS_RELEASE}-jar-with-dependencies.jar /vulas/patch-lib-analyzer.jar
-COPY run.sh /vulas/run.sh
+COPY patch-lib-analyzer-${VULAS_RELEASE}-jar-with-dependencies.jar /steady/patch-lib-analyzer.jar
+COPY run.sh /steady/run.sh
 
-RUN chmod +x /vulas/run.sh
+RUN chmod +x /steady/run.sh
 
-CMD ["/vulas/run.sh"]
+CMD ["/steady/run.sh"]

docker/patch-lib-analyzer/run.sh

@@ -10,4 +10,4 @@ java \
 	-Dhttps.proxyHost=$HTTPS_PROXY_HOST \
 	-Dhttps.proxyPort=$HTTPS_PROXY_PORT \
     -Dspring.profiles.active=docker \
-	-jar /vulas/patch-lib-analyzer.jar $PATCHEVAL_OPTS
+	-jar /steady/patch-lib-analyzer.jar $PATCHEVAL_OPTS

docker/rest-backend/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:11-jre-slim
+# https://hub.docker.com/layers/library/eclipse-temurin/11.0.16.1_1-jre/images/sha256-ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106?context=explore
+FROM eclipse-temurin@sha256:ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106
 
 LABEL maintainer="[email protected]"
 
@@ -10,12 +11,12 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 
-COPY rest-backend-$VULAS_RELEASE.jar /vulas/rest-backend.jar
-COPY run.sh /vulas/run.sh
+COPY rest-backend-$VULAS_RELEASE.jar /steady/rest-backend.jar
+COPY run.sh /steady/run.sh
 RUN touch /$VULAS_RELEASE
 
 EXPOSE 8091
 
-RUN chmod +x /vulas/run.sh
+RUN chmod +x /steady/run.sh
 
-CMD ["/vulas/run.sh"]
+CMD ["/steady/run.sh"]

docker/rest-backend/run.sh

@@ -20,4 +20,4 @@ java \
     -Dvulas.jira.pwd=$JIRA_PASSWORD \
     $FLYWAY_OPTS \
     -Dspring.profiles.active=docker \
-	-jar /vulas/rest-backend.jar
+	-jar /steady/rest-backend.jar

docker/rest-lib-utils/Dockerfile

@@ -1,12 +1,13 @@
-FROM openjdk:11-jre-slim
+# https://hub.docker.com/layers/library/eclipse-temurin/11.0.16.1_1-jre/images/sha256-ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106?context=explore
+FROM eclipse-temurin@sha256:ba66fe69ca119df55837f1e1185a242912ebb67431b332c67b153a8dbbe42106
 
 LABEL maintainer="[email protected]"
 
 ARG VULAS_RELEASE
 
-COPY rest-lib-utils-${VULAS_RELEASE}.jar /vulas/rest-lib-utils.jar
+COPY rest-lib-utils-${VULAS_RELEASE}.jar /steady/rest-lib-utils.jar
 RUN touch /$VULAS_RELEASE
 
 EXPOSE 8092
 
-CMD java -Dhttp.nonProxyHosts=${NON_PROXY_HOSTS} -Dhttps.nonProxyHosts=${NON_PROXY_HOSTS} -Dhttps.proxyHost=${HTTPS_PROXY_HOST} -Dhttps.proxyPort=${HTTP_PROXY_PORT} -Dhttp.proxyHost=${HTTP_PROXY_HOST} -Dhttp.proxyPort=${HTTP_PROXY_PORT} -jar /vulas/rest-lib-utils.jar
+CMD java -Dhttp.nonProxyHosts=${NON_PROXY_HOSTS} -Dhttps.nonProxyHosts=${NON_PROXY_HOSTS} -Dhttps.proxyHost=${HTTPS_PROXY_HOST} -Dhttps.proxyPort=${HTTP_PROXY_PORT} -Dhttp.proxyHost=${HTTP_PROXY_HOST} -Dhttp.proxyPort=${HTTP_PROXY_PORT} -jar /steady/rest-lib-utils.jar

docs/public/content/admin/tutorials/build.md

@@ -43,6 +43,8 @@ docker run -it --rm -v ${PWD}/docker:/exporter --env-file ./docker/.env -e mvn_f
 
 > In case you are running behind a proxy you need to configure it in the `--build-arg` arguments. Check the [predefined `ARG`s](https://docs.docker.com/engine/reference/builder/#predefined-args) documentation to know more.
 
+> In case you'd like to avoid downloading all dependencies by reusing your local Maven repository, add a volume as follows `-v "$HOME/.m2":/root/.m2`, see [here](https://hub.docker.com/_/maven/) for more information.
+
 As a result, the folders `docker/<component-name>` will contain compiled JARs (or WARs, depending on the component). The folder `docker/client-tools` will be populated with the JARs for client side tools (CLI, plugins, patchanalyzer).
 
 Additionally, you may want to make the artifacts available to the developers of your organization (e.g., through an internal Nexus or other artifact distribution system).
@@ -65,6 +67,11 @@ To check everything started successfully, browse the page `http://localhost:8033
 
 > `username` and `password` can be found in your `.env` file, be also advised that `rest-backend` could take more than 30 seconds to be ready to answer HTTP requests
 
+Run the following to stop all containers.
+
+```sh
+(cd docker && docker-compose -f docker-compose.yml -f docker-compose.build.yml down)
+```
 ---
 
 Get going:

frontend-apps/src/main/webapp/model/Config.js

@@ -325,7 +325,7 @@ model.Config.loadData = function(oModel,sUrl, method) {
 	oModel.attachRequestFailed(function(oControlEvent){
 		if(oControlEvent.getParameters().statusCode=="503"){
 			sap.m.MessageBox.warning(
-				"The Vulas backend is in maintenance mode. Please come back later."
+				"The backend is in maintenance mode. Please come back later."
 			);
 		}
 	});
@@ -343,7 +343,7 @@ model.Config.loadDataSync = function(oModel,sUrl, method, tenant) {
 		console.log(oControlEvent.getParameters().statusCode);
 		if(oControlEvent.getParameters().statusCode=="503"){
 			sap.m.MessageBox.warning(
-				"The Vulas backend is in maintenance mode. Please come back later."
+				"The backend is in maintenance mode. Please come back later."
 			);
 		}
 	});