diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/docker/pom.xml | 75 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/Dockerfile.so-app | 20 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image | 5 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks | bin | 3582 -> 0 bytes | |||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/certs/org.onap.so.keyfile | 27 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/certs/org.onap.so.trust.jks | bin | 1413 -> 0 bytes | |||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/scripts/.gitattributes | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | packages/docker/src/main/docker/docker-files/scripts/start-app.sh | 4 | ||||
| -rw-r--r-- | packages/pom.xml | 2 |
9 files changed, 62 insertions, 76 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index c78979eccb..b231dedf91 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.so</groupId> <artifactId>packages</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> @@ -77,16 +77,14 @@ <name>${docker.image.prefix}/base-image:1.0</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-base-image</dockerFile> + <dockerFile>docker-files/Dockerfile.so-base-image</dockerFile> </build> </image> <image> <name>${docker.image.prefix}/vnfm-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -110,8 +108,7 @@ <name>${docker.image.prefix}/ve-vnfm-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -135,8 +132,7 @@ <name>${docker.image.prefix}/catalog-db-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -160,8 +156,7 @@ <name>${docker.image.prefix}/request-db-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -185,8 +180,7 @@ <name>${docker.image.prefix}/sdnc-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -210,8 +204,7 @@ <name>${docker.image.prefix}/openstack-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -235,8 +228,7 @@ <name>${docker.image.prefix}/vfc-adapter</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -257,11 +249,34 @@ </build> </image> <image> + <name>${docker.image.prefix}/nssmf-adapter</name> + <build> + <cleanup>try</cleanup> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + <assembly> + <inline> + <dependencySets> + <dependencySet> + <includes> + <include>org.onap.so.adapters:mso-nssmf-adapter</include> + </includes> + <outputFileNameMapping>app.jar</outputFileNameMapping> + </dependencySet> + </dependencySets> + </inline> + </assembly> + </build> + </image> + <image> <name>${docker.image.prefix}/so-appc-orchestrator</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -285,8 +300,7 @@ <name>${docker.image.prefix}/sdc-controller</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -310,8 +324,7 @@ <name>${docker.image.prefix}/bpmn-infra</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -335,8 +348,7 @@ <name>${docker.image.prefix}/api-handler-infra</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -360,8 +372,7 @@ <name>${docker.image.prefix}/so-monitoring</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -385,8 +396,7 @@ <name>${docker.image.prefix}/so-simulator</name> <build> <cleanup>try</cleanup> - <dockerFileDir>docker-files</dockerFileDir> - <dockerFile>Dockerfile.so-app</dockerFile> + <dockerFile>docker-files/Dockerfile.so-app</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> @@ -437,7 +447,7 @@ <goal>push</goal> </goals> <configuration> - <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/so-simulator</image> + <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring,${docker.image.prefix}/so-simulator,${docker.image.prefix}/mso-nssmf-adapter</image> </configuration> </execution> </executions> @@ -492,6 +502,11 @@ </dependency> <dependency> <groupId>org.onap.so.adapters</groupId> + <artifactId>mso-nssmf-adapter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.so.adapters</groupId> <artifactId>so-appc-orchestrator</artifactId> <version>${project.version}</version> </dependency> diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app index 90f0a6627d..dc86ff8290 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app @@ -7,24 +7,20 @@ ARG https_proxy ENV HTTPS_PROXY=$https_proxy ENV https_proxy=$HTTPS_PROXY -RUN mkdir /app && mkdir /app/config && mkdir /app/certificates && mkdir /app/logs && mkdir /app/ca-certificates +USER root +RUN mkdir -p /app/config +RUN mkdir -p /app/certificates +RUN mkdir -p /app/logs +RUN mkdir -p /app/ca-certificates COPY maven/app.jar /app COPY configs/logging/logback-spring.xml /app COPY scripts/start-app.sh /app COPY scripts/wait-for.sh /app COPY ca-certificates/onap-ca.crt /app/ca-certificates/onap-ca.crt -COPY certs/* /app/ - -RUN chown -R so:so /app && chmod 700 /app/*.sh - -## TODO for Casablanca: install this in the openstack-adapter container -## Install heatbridge -#RUN apt-get install -y python && apt-get install -y python-pip && echo 'PIP Installed, doing upgrade' && pip install --upgrade pip -#RUN mkdir /opt/mso/heatbridge -#COPY heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl /opt/mso/heatbridge -#RUN pip install /opt/mso/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl +RUN chown -R so:so /app +USER so # Springboot configuration (required) VOLUME /app/config @@ -32,4 +28,4 @@ VOLUME /app/config VOLUME /app/ca-certificates WORKDIR /app -CMD ["/app/start-app.sh"] +ENTRYPOINT ["/app/start-app.sh"] diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image index c0b298e778..031142f216 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image @@ -7,11 +7,8 @@ ENV HTTPS_PROXY=$https_proxy ENV http_proxy=$HTTP_PROXY ENV https_proxy=$HTTPS_PROXY -# Update the package list and upgrade installed packages -RUN apk update && apk upgrade - # Install commonly needed tools -RUN apk --no-cache add curl netcat-openbsd sudo nss +RUN apk --no-cache add curl netcat-openbsd nss # Create 'so' user RUN addgroup -g 1000 so && adduser -S -u 1000 -G so -s /bin/sh so diff --git a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks b/packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks Binary files differdeleted file mode 100644 index 1e849afb5e..0000000000 --- a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks +++ /dev/null diff --git a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.keyfile b/packages/docker/src/main/docker/docker-files/certs/org.onap.so.keyfile deleted file mode 100644 index 9000ed29fb..0000000000 --- a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.keyfile +++ /dev/null @@ -1,27 +0,0 @@ -xVdhDotWIx2RB3f8RxAFQb9mkHVVdIzv8eiij9cDjg_5ea5HWPS7OzLR5lv4NA0vStrAMfSAaS2e -j4rzvrlserM9bTRco3JHb-i6ZGYMoTL6kuFJ9JMveSqg-fkwvrm7VcYQJBs1FIE3hRLNqiGJ34ud -hDRp-cGUvNRLIImksKT2fmUyEawLLuE0Lo5aX46y0ibjIMe7clMxLHIS5-WggvkgIOPkVDcxqLT2 -OteGptqW1cjrm1ydbTkLYN6dd7ZmRsT3ULPYLEtPTlZ2vCh7bFBBvP_tjp2cZf4uSPM6EClYAikn -dnTqivOfCZn25r0xeXuectoXbq12fws_jaCH05ZK1wJwAF_cQNfpvaiM457rE672YV3Ev4yhXCyM -1jVL2P9Chl1sSBkZujCftvaj1rlippP9P_eohcLv84mtApEyV49rBFRMtkX9ZVdPyb8shFSoXJxk -M6DentRzY1g37mVJ1B1YMKPNQj95nOD4gLvjbUZ7dATuroENsG7oUWkfaV6dokfTmh504ZbyeqGh -xa7yfr3326fMQBhQMpsyqD2o_Obe5wN57p-vb469w65pUmK7iJDa0Fgxaxy8XNNnw6gCurbbsvyU -nB8UdfhTvL5mJew_tKUvtq_KH9ajnA8giSxuFd9KM6YHJWiFMXIROEQT7hKjTJka1ghERBjcH_pY -hbKtHdvbrS7T2hGwY_MQEUXYQBirtjaEwAvI960hXQt1K-MC8PNLRYtdLKE2Aq3amMt7ZKtrHSeN -33I1MjXc3wRUeOi5A6qImge1Q_Wmn1SURAn9KbEv9eoMUbQUkN1z2iyw4x94BZpBk5GjDypKKOyg -guec0UY3y9wqm5gGW7XvT3v1lZqo5180VgK49iFgA4IhWZ7dnDFQmq6IHTr1pM4kuvJ9dka9saIh -9xCk_KINPp5_dqJ2Lhak2IeRg_Zm3belm1jvYGCyRRqfoi9WGrDh3LLZeK8MHrrfzLI4Toy_n6DG -UNXPrXqrZPREfW2lhYLRfrivOBYWPq9JidQXn1UctSmWdNoMH7XuikBpAwmlInNA_5j9J-L-gf9D -cw2zoby3_wvcm5vxndnocEdhqVVdo7uMmXasQqphuyJP8rgCJf_I1v0Qe5F-JXsj6xDvarOUPOTj -Z93a64EO0KI0OznolRyBqHpIXffbGh7e1EpAE0LMESKJC3Mjmsgz1ld3s7WfdeDK-IxUEHJLHlhY -IjBlY6q3OJDrgvPLkwoWPbI48tmRUJX1BCafvDU6W8crl4VQKhL_l5ANAX5oaKwh-0ZJAZ15tna5 -6fjWcWrtQSdNQxj0jXV7uEcBtRtyPyOk2uw4HJDBLQyyOglUUxcQZJFCFp2fCHmNyttmUJQ5U9cu -yw9lKhsyBJ5TB4psbp64_0EalITeAGrpuH1I1N2m1O5ZY8pmrpPtA1Mb5rQ4IJqiVbZgHTcvSiN5 -Z2SilurhI1vq4_aN_UZJQvEnw9U5WU3ysphsQk8RZKbFH4W9GDtmEGbAkRkTy17KrDIuMpe--XJF -SQHUd4tzxbiYVYHKdF6Ce1kfQ-DEFXEf7RddwuKbc7tw2pSjy1MVH4HSRoTOQQpewZRTfG-4d3MX -B99-QgufEk1OBkfemuDhdnPty5qkOLUEG_uQKPpD0QDVf-t4OxZqk_8G_dCJcXbmY4VT3V7pdN_I -qp2xP98wGcIPuLGlEB8px94jKdUolkqeV_UTmmkTGz-szLzgK_YhnnVJn8VeyNsPTwAFUlqiPTyT -n_7rCb_6nNKlriadaHu6IuJWehv03ZR9jS0P1Y3YLM286deCLFu93lN3nY4yf-SEguASdHJNCBFJ -RQViYm8Tfuim5F0KQGafheGcdZxTvBFihnDduQWNBR_bDB9zfD6OtvvkseyyWHt3gHkJm5QeCjWK -RzRvbjLpUnA31cJeEXmnmhB5qMAvjn8yORKcotn3u4MXdHEk-s8vR_SKykS6IcaYE1xxbowtg-UG -d1iaky1NFYa2VZ4pGx9lD93GDTDynmOSfzVeVsxhTu_5rAanpDkUYVuxOzajmRh55I8a6dRk
\ No newline at end of file diff --git a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.trust.jks b/packages/docker/src/main/docker/docker-files/certs/org.onap.so.trust.jks Binary files differdeleted file mode 100644 index 71c6e776a3..0000000000 --- a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.trust.jks +++ /dev/null diff --git a/packages/docker/src/main/docker/docker-files/scripts/.gitattributes b/packages/docker/src/main/docker/docker-files/scripts/.gitattributes new file mode 100644 index 0000000000..b905d1de69 --- /dev/null +++ b/packages/docker/src/main/docker/docker-files/scripts/.gitattributes @@ -0,0 +1,5 @@ +# Default behavior +* text=auto + +# Files to have unix style line endings on checkout +*.sh text eol=lf
\ No newline at end of file diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh index 75d64fefa0..74d17fc9b7 100644..100755 --- a/packages/docker/src/main/docker/docker-files/scripts/start-app.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/start-app.sh @@ -16,7 +16,7 @@ then update-ca-certificates --fresh fi - # Re-exec this script as the 'so' user. + # Re-exec this script as the 'onap' user. this=`readlink -f $0` exec su so -c "$this" fi @@ -46,7 +46,7 @@ fi if [ ${APP} = "bpmn-infra" ]; then ln -s ${LOG_PATH} BPMN -fi +fi if [ ${APP} = "so-monitoring" ]; then ln -s ${LOG_PATH} MONITORING diff --git a/packages/pom.xml b/packages/pom.xml index 029fa3d446..af302405cc 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so</groupId> <artifactId>so</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> </parent> <artifactId>packages</artifactId> |