diff options
author | 2022-01-27 13:43:37 +0100 | |
---|---|---|
committer | 2022-01-27 14:01:45 +0100 | |
commit | 38509f1fbad27de70eef1e81eaa2c5084765ca8f (patch) | |
tree | 71ee996cae9edba8e3806c8803f202e543ab9365 /installation/sdnc-web/src/main/docker/Dockerfile | |
parent | bcdddcc342180eb1aa5cf8a9f1b4b84990d5f87d (diff) |
improve sdnc-web for external apps
add package manager for more flexibility
Issue-ID: SDNC-1658
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I30f4aaa24cf05fce212282b06d5e08437dbcfa8b
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Former-commit-id: f41f011ff2e18befd77dd63ab828ea14aafac2a7
Diffstat (limited to 'installation/sdnc-web/src/main/docker/Dockerfile')
-rw-r--r-- | installation/sdnc-web/src/main/docker/Dockerfile | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/installation/sdnc-web/src/main/docker/Dockerfile b/installation/sdnc-web/src/main/docker/Dockerfile index a552137f..9f3f6870 100644 --- a/installation/sdnc-web/src/main/docker/Dockerfile +++ b/installation/sdnc-web/src/main/docker/Dockerfile @@ -22,12 +22,14 @@ # Base bitnami nginx image FROM ${base.image.repo} LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" - +USER root +RUN apt-get update && apt-get install python3-minimal python3-urllib3 unzip openssl -y +USER 1001 # copy ODLUX files to nginx COPY html /opt/bitnami/nginx/html # copy site conf files -COPY *.conf /opt/bitnami/nginx/conf/server_blocks/ +COPY conf/* /opt/bitnami/nginx/conf/server_blocks/ # setup environment variables ENV WEBPROTOCOL="HTTP" \ @@ -38,20 +40,25 @@ ENV WEBPROTOCOL="HTTP" \ TRPCEURL="" \ TOPOURL="" \ TILEURL="" \ - DNS_RESOLVER="1.1.1.1" \ + SITEDOCURL="" \ + DNS_RESOLVER="1.1.1.1 ipv6=off" \ + DNS_INTERNAL_RESOLVER="127.0.0.11" \ SSL_CERT_DIR="/app/cert" \ SSL_CERTIFICATE="cert.pem" \ SSL_CERTIFICATE_KEY="cert.key" # Check if /app can be used. If so, create "custom" directory and copy the files there. -COPY bin/*.sh /opt/bitnami/nginx/sbin/ +COPY bin/* /opt/bitnami/nginx/sbin/ USER root -RUN chmod +x /opt/bitnami/nginx/sbin/configure.sh /opt/bitnami/nginx/sbin/run.sh +RUN chmod +x /opt/bitnami/nginx/sbin/run.sh /opt/bitnami/nginx/sbin/opm.py # By default, docker copies files with the permissions of the build user. To avoid cases where build user # has 644 which can result in failure of certain commands -RUN chmod -R g+w /opt/bitnami/nginx/html/odlux - +RUN chmod -R g+w /opt/bitnami/nginx/html/odlux && mkdir /app/init.d +RUN chmod 666 /opt/bitnami/nginx/conf/server_blocks/*.rules +#RUN chown 1001:1001 /app/odlux.application.list && chmod 777 /app/odlux.application.list +RUN chown -R 1001:1001 /app +RUN ln -s /opt/bitnami/nginx/sbin/opm.py /usr/local/bin/opm USER 1001 CMD [ "/opt/bitnami/nginx/sbin/run.sh" ] |