diff options
author | 2021-01-12 12:35:11 +0000 | |
---|---|---|
committer | 2021-01-20 16:15:21 +0000 | |
commit | fc2c1e0287ec425846fb4bbb437a43308f2d774b (patch) | |
tree | 8124302c4c45618641b50b203d8b64ba7a54bfdd /src | |
parent | 176498d8baa90c988c5e0af6dfb709df744e4ccb (diff) |
Add tosca-controlloop directory for TOSCA-POC dev
The module structure is:
./tosca-controlloop (maven module)
./tosca-controlloop/common (maven module, could be moved to policy-common)
./tosca-controlloop/design (maven module, control loop design time component)
./tosca-controlloop/models (maven module, should be moved to policy-models)
./tosca-controlloop/participants (maven modue for control loop participants)
./tosca-controlloop/runtime (maven module, control loop run time component)
This patch also updates the repo to the current status of the master
branch
Issue-ID: POLICY-2971
Change-Id: I98c7e25f592cc7d9783d5daff3e9e3ad2e7b5214
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/docker/backend/Dockerfile | 16 | ||||
-rw-r--r-- | src/main/docker/frontend/Dockerfile | 23 | ||||
-rw-r--r-- | src/main/resources/boot-message.txt | 25 | ||||
-rw-r--r-- | src/main/resources/logback-default.xml | 2 | ||||
-rw-r--r-- | src/test/resources/logback.xml | 2 |
5 files changed, 41 insertions, 27 deletions
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile index 8712f1934..63268d805 100644 --- a/src/main/docker/backend/Dockerfile +++ b/src/main/docker/backend/Dockerfile @@ -24,7 +24,7 @@ FROM onap/integration-java11:7.1.0
MAINTAINER "The Onap Team"
-LABEL Description="This image contains alpine, openjdk 11 and clamp"
+LABEL Description="This image contains alpine, openjdk 11 and policy clamp"
ARG http_proxy
ARG https_proxy
@@ -32,14 +32,16 @@ ENV HTTP_PROXY=$http_proxy ENV HTTPS_PROXY=$https_proxy
ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
+
USER root
-RUN mkdir /opt/clamp
-RUN chown -R onap:onap /opt/clamp
-VOLUME /opt/clamp/config
+RUN mkdir -p /opt/policy/clamp && \
+ chown -R onap:onap /opt/policy/clamp
+
+VOLUME /opt/policy/clamp/config
-COPY --chown=onap:onap onap-clamp-backend/clamp.jar /opt/clamp/app.jar
+COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar
USER onap
-WORKDIR /opt/clamp/
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75","-jar" ,"./app.jar"]
\ No newline at end of file +WORKDIR /opt/policy/clamp/
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]
\ No newline at end of file diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile index 660fb8240..e67495350 100644 --- a/src/main/docker/frontend/Dockerfile +++ b/src/main/docker/frontend/Dockerfile @@ -25,9 +25,9 @@ FROM node:12.10.0-alpine as build
WORKDIR /app
#ENV PATH /app/node_modules/.bin:$PATH
-COPY onap-clamp-frontend/ /app/
-RUN npm install --silent
-RUN npm run build
+COPY onap-policy-clamp-frontend/ /app/
+RUN npm install --silent && \
+ npm run build
FROM nginx:1.17.0-alpine
@@ -41,14 +41,17 @@ ENV HTTPS_PROXY=$https_proxy ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
-RUN addgroup onap && adduser -D -G onap clamp
-RUN mkdir /var/log/onap
-RUN chmod a+rwx /var/log/onap
+RUN addgroup onap && \
+ adduser -D -G onap clamp && \
+ mkdir /var/log/onap && \
+ chmod a+rwx /var/log/onap
COPY --from=build /app/build /usr/share/nginx/html
COPY --from=build /app/ssl /etc/ssl
-RUN rm /etc/nginx/conf.d/default.conf
-RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
+
+RUN rm /etc/nginx/conf.d/default.conf && \
+ ln -sf /dev/stdout /var/log/nginx/access.log && \
+ ln -sf /dev/stderr /var/log/nginx/error.log
COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
@@ -58,8 +61,8 @@ WORKDIR /app RUN chown -R clamp:onap /app && chmod -R 755 /app && \
chown -R clamp:onap /var/cache/nginx && \
chown -R clamp:onap /var/log/nginx && \
- chown -R clamp:onap /etc/nginx/conf.d
-RUN touch /var/run/nginx.pid && \
+ chown -R clamp:onap /etc/nginx/conf.d && \
+ touch /var/run/nginx.pid && \
chown -R clamp:onap /var/run/nginx.pid
USER clamp
diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt index ef1478b93..b0d68e04c 100644 --- a/src/main/resources/boot-message.txt +++ b/src/main/resources/boot-message.txt @@ -1,12 +1,21 @@ - ____ ____ ____ ____ _________ ____ ____ ____ ____ ____ ____ -||O |||N |||A |||P ||| |||G |||u |||i |||l |||i |||n || -||__|||__|||__|||__|||_______|||__|||__|||__|||__|||__|||__|| -|/__\|/__\|/__\|/__\|/_______\|/__\|/__\|/__\|/__\|/__\|/__\| - _________ ____ ____ ____ ____ ____ - || |||C |||L |||A |||M |||P || - ||_______|||__|||__|||__|||__|||__|| - |/_______\|/__\|/__\|/__\|/__\|/__\| + ___ ____ ____ ____ __ __ ___ ____ ___ _ __ __ _ __ __ + / \ | \ / T| \ | T T / \ | \ / \ | T | T T| T | T T +Y Y| _ YY o || o ) | l |Y Y| _ YY Y| | | | || | | | | +| O || | || || _/ | _ || O || | || O || l___ | | || l___ | | | +| || | || _ || | | | || || | || || T| : || T| : | +l !| | || | || | | | |l !| | |l !| |l || |l | + \___/ l__j__jl__j__jl__j l__j__j \___/ l__j__j \___/ l_____j \__,_jl_____j \__,_j + + ____ ___ _ ____ __ __ __ __ _ ____ ___ ___ ____ +| \ / \ | T l j / ]| T T / ]| T / T| T T| \ +| o )Y Y| | | T / / | | | _____ / / | | Y o || _ _ || o ) +| _/ | O || l___ | | / / | ~ || | / / | l___ | || \_/ || _/ +| | | || T | |/ \_ l___, |l_____j/ \_ | T| _ || | || | +| | l !| | j l\ || ! \ || || | || | || | +l__j \___/ l_____j|____j\____jl____/ \____jl_____jl__j__jl___j___jl__j + + :: Starting ::
\ No newline at end of file diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml index e263a13fc..5397eab04 100644 --- a/src/main/resources/logback-default.xml +++ b/src/main/resources/logback-default.xml @@ -261,7 +261,7 @@ <!-- CLAMP related loggers --> <logger - name="org.onap.clamp" + name="org.onap.policy.clamp" level="DEBUG"> <appender-ref ref="ERROR" /> <appender-ref ref="DEBUG" /> diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index c47cab31c..97a8982a9 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -64,7 +64,7 @@ <!-- CLDS related loggers --> <logger - name="org.onap.clamp" + name="org.onap.policy.clamp" level="DEBUG"> <appender-ref ref="STDOUT" /> </logger> |