diff --git a/portal-docker/pom.xml b/portal-docker/pom.xml index 13b61e6e..6a103cd3 100644 --- a/portal-docker/pom.xml +++ b/portal-docker/pom.xml @@ -7,9 +7,9 @@ ../../wlan-cloud-root - portal-process-docker + portal-docker pom - portal-process-docker + portal-docker Docker definition for process definition for portal. diff --git a/portal-docker/src/main/docker/app/logback.xml b/portal-docker/src/main/docker/app/logback.xml index ce22431d..d3bc17d3 100644 --- a/portal-docker/src/main/docker/app/logback.xml +++ b/portal-docker/src/main/docker/app/logback.xml @@ -8,13 +8,18 @@ + + - %d{yyyy-MM-DD HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - + + + + + - + + /app/logs/portalservice.log true @@ -39,35 +45,30 @@ 20MB - + + - - - - - - - - + + + + - + diff --git a/prov-docker/pom.xml b/prov-docker/pom.xml new file mode 100644 index 00000000..1bf93869 --- /dev/null +++ b/prov-docker/pom.xml @@ -0,0 +1,94 @@ + + 4.0.0 + + com.telecominfraproject.wlan + tip-wlan-cloud-root-pom + 0.0.1-SNAPSHOT + ../../wlan-cloud-root + + + prov-docker + pom + prov-docker + Docker definition for process definition for provisioning service. + + + 0.28.0 + tip-tip-wlan-cloud-docker-repo.jfrog.io + + + + + com.telecominfraproject.wlan + prov-process + ${tip-wlan-cloud.release.version} + + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + true + 1.23 + + + wlan-prov-service:${project.version} + + @ + try + ${project.basedir}/src/main/docker + Dockerfile + + + + + + com.telecominfraproject.wlan:prov-process:jar + + false + app.jar + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + diff --git a/prov-docker/src/main/docker/Dockerfile b/prov-docker/src/main/docker/Dockerfile new file mode 100644 index 00000000..ef95239f --- /dev/null +++ b/prov-docker/src/main/docker/Dockerfile @@ -0,0 +1,15 @@ +FROM adoptopenjdk/openjdk13:alpine-jre +MAINTAINER ConnectUs + +# Update the package list and upgrade installed packages +RUN apk update && apk upgrade && apk add bash +RUN mkdir /app && mkdir /app/logs && mkdir /app/prov + +COPY maven/app.jar /app +COPY app/run.sh /app +COPY app/logback.xml /app/prov/logback.xml + +RUN chmod +x /app/run.sh + +WORKDIR /app +ENTRYPOINT ["/app/run.sh"] \ No newline at end of file diff --git a/prov-docker/src/main/docker/app/logback.xml b/prov-docker/src/main/docker/app/logback.xml new file mode 100644 index 00000000..42086346 --- /dev/null +++ b/prov-docker/src/main/docker/app/logback.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + %d{yyyy-MM-DD HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex + + + + + + + + + + /app/logs/provservice.log + true + + %date %level [%thread] %logger{36} [%file:%line] %msg%n + + + /app/logs/provservice.%i.log.gz + 1 + 3 + + + 20MB + + + + + + + + + + + + + + + + + + + diff --git a/prov-docker/src/main/docker/app/run.sh b/prov-docker/src/main/docker/app/run.sh new file mode 100644 index 00000000..6eed4601 --- /dev/null +++ b/prov-docker/src/main/docker/app/run.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +LOGGING_PROPS=" -Dlogging.config=file:/app/prov/logback.xml" + +export ALL_PROPS="$LOGGING_PROPS" + +java $ALL_PROPS -jar app.jar \ No newline at end of file diff --git a/ssc-docker/pom.xml b/ssc-docker/pom.xml new file mode 100644 index 00000000..baa5831b --- /dev/null +++ b/ssc-docker/pom.xml @@ -0,0 +1,94 @@ + + 4.0.0 + + com.telecominfraproject.wlan + tip-wlan-cloud-root-pom + 0.0.1-SNAPSHOT + ../../wlan-cloud-root + + + ssc-docker + pom + ssc-docker + Docker definition for process definition of Scalable Service container. + + + 0.28.0 + tip-tip-wlan-cloud-docker-repo.jfrog.io + + + + + com.telecominfraproject.wlan + ssc-process + ${tip-wlan-cloud.release.version} + + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + true + 1.23 + + + wlan-ssc-service:${project.version} + + @ + try + ${project.basedir}/src/main/docker + Dockerfile + + + + + + com.telecominfraproject.wlan:ssc-process:jar + + false + app.jar + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + diff --git a/ssc-docker/src/main/docker/Dockerfile b/ssc-docker/src/main/docker/Dockerfile new file mode 100644 index 00000000..ef95239f --- /dev/null +++ b/ssc-docker/src/main/docker/Dockerfile @@ -0,0 +1,15 @@ +FROM adoptopenjdk/openjdk13:alpine-jre +MAINTAINER ConnectUs + +# Update the package list and upgrade installed packages +RUN apk update && apk upgrade && apk add bash +RUN mkdir /app && mkdir /app/logs && mkdir /app/prov + +COPY maven/app.jar /app +COPY app/run.sh /app +COPY app/logback.xml /app/prov/logback.xml + +RUN chmod +x /app/run.sh + +WORKDIR /app +ENTRYPOINT ["/app/run.sh"] \ No newline at end of file diff --git a/ssc-docker/src/main/docker/app/logback.xml b/ssc-docker/src/main/docker/app/logback.xml new file mode 100644 index 00000000..0479a63e --- /dev/null +++ b/ssc-docker/src/main/docker/app/logback.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + %d{yyyy-MM-DD HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex + + + + + + + + + + /app/logs/sscservice.log + true + + %date %level [%thread] %logger{36} [%file:%line] %msg%n + + + /app/logs/sscservice.%i.log.gz + 1 + 3 + + + 20MB + + + + + + + + + + + + + + + + + + + diff --git a/ssc-docker/src/main/docker/app/run.sh b/ssc-docker/src/main/docker/app/run.sh new file mode 100644 index 00000000..6eed4601 --- /dev/null +++ b/ssc-docker/src/main/docker/app/run.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +LOGGING_PROPS=" -Dlogging.config=file:/app/prov/logback.xml" + +export ALL_PROPS="$LOGGING_PROPS" + +java $ALL_PROPS -jar app.jar \ No newline at end of file