diff options
-rw-r--r-- | deliveries/Dockerfile.sdk | 5 | ||||
-rw-r--r-- | docs/platform/architecture.rst | 4 | ||||
-rw-r--r-- | docs/platform/offeredapis.rst | 4 | ||||
-rw-r--r-- | docs/tutorials/portal-sdk/architecture.rst | 1 | ||||
-rw-r--r-- | releases/3.2.0-container-portal-docker.yaml | 13 | ||||
-rw-r--r-- | releases/3.2.0-container.yaml | 15 | ||||
-rw-r--r-- | releases/3.2.0.yaml | 2 |
7 files changed, 23 insertions, 21 deletions
diff --git a/deliveries/Dockerfile.sdk b/deliveries/Dockerfile.sdk index 4757d8a4..b85cf846 100644 --- a/deliveries/Dockerfile.sdk +++ b/deliveries/Dockerfile.sdk @@ -39,7 +39,10 @@ RUN cd ${SDKCONTEXT} && unzip -q *.war && rm *.war VOLUME ${TOMCATHOME}/logs # Switch to unprivileged user -RUN addgroup -g 1000 -S portal && adduser -u 1000 -S portal -G portal +RUN addgroup -g 1000 -S portal && \ + adduser -u 1000 -S portal -G portal && \ + mkdir -p ${TOMCATHOME}/temp && \ + chown portal:portal ${TOMCATHOME}/temp USER portal # Switch back to root diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst index cd212688..7550ac6d 100644 --- a/docs/platform/architecture.rst +++ b/docs/platform/architecture.rst @@ -1,6 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 - +.. _architecture: Architecture ------------ @@ -21,4 +21,4 @@ From the Portal, users access applications and Key Performance Indicators. Admin Here are two views of the Portal landing screen, one for administrators, and one for users: -.. image:: PortalLandingPage.png +.. image:: PortalLandingPage.png
\ No newline at end of file diff --git a/docs/platform/offeredapis.rst b/docs/platform/offeredapis.rst index d2966819..594fed96 100644 --- a/docs/platform/offeredapis.rst +++ b/docs/platform/offeredapis.rst @@ -1,6 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 - +.. _offeredapis: Offered APIs ============ @@ -33,4 +33,4 @@ Additional information, including examples, can be found at `PortalApi link`_. .. _PortalApi link: https://wiki.onap.org/display/DW/Portal+API -End of Document
\ No newline at end of file +End of Document diff --git a/docs/tutorials/portal-sdk/architecture.rst b/docs/tutorials/portal-sdk/architecture.rst index ec64bf22..79e5cdc8 100644 --- a/docs/tutorials/portal-sdk/architecture.rst +++ b/docs/tutorials/portal-sdk/architecture.rst @@ -1,4 +1,5 @@ Application architecture ============================================ +.. _architecture: Click here to see the `ONAP Portal Architecture <../../../docs/platform/architecture.html>`_. diff --git a/releases/3.2.0-container-portal-docker.yaml b/releases/3.2.0-container-portal-docker.yaml new file mode 100644 index 00000000..206668b3 --- /dev/null +++ b/releases/3.2.0-container-portal-docker.yaml @@ -0,0 +1,13 @@ +distribution_type: container +container_release_tag: 3.2.0 +project: portal +ref: 5d6efffa8ea241da2992de1c62eab5e8676a7dd8 +containers: + - name: portal-app + version: 3.2.0-STAGING-latest + - name: portal-sdk + version: 3.2.0-STAGING-latest + - name: portal-wms + version: 3.2.0-STAGING-latest + - name: portal-db + version: 3.2.0-STAGING-latest
\ No newline at end of file diff --git a/releases/3.2.0-container.yaml b/releases/3.2.0-container.yaml deleted file mode 100644 index 5071069f..00000000 --- a/releases/3.2.0-container.yaml +++ /dev/null @@ -1,15 +0,0 @@ -distribution_type: container -container_release_tag: 3.2.0 -container_pull_registry: nexus.onap.org:10003 -container_push_registry: nexus.onap.org:10002 -project: portal -ref: 70aa24130b5dfa987e079a68ea350ddcb5c66dc9 -containers: - - name: portal-app - version: 3.2.0 - - name: portal-sdk - version: 3.2.0 - - name: portal-wms - version: 3.2.0 - - name: portal-db - version: 3.2.0 diff --git a/releases/3.2.0.yaml b/releases/3.2.0.yaml index 5513f546..13bd3249 100644 --- a/releases/3.2.0.yaml +++ b/releases/3.2.0.yaml @@ -1,4 +1,4 @@ distribution_type: 'maven' version: '3.2.0' project: 'portal-app' -log_dir: 'portal-app-maven-stage-master/336/' +log_dir: 'portal-maven-stage-master/352/' |