summaryrefslogtreecommitdiffstats
path: root/openecomp-be/dist
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/dist')
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile12
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb2
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh4
-rw-r--r--openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile15
-rw-r--r--openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh2
5 files changed, 16 insertions, 19 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index e6a0dc1ec2..acc84ab393 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -1,17 +1,15 @@
FROM onap/base_sdc-jetty:1.6.0
-COPY chef-solo /root/chef-solo/
+COPY --chown=jetty:jetty chef-solo ${JETTY_BASE}/chef-solo/
-COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
+COPY --chown=jetty:jetty chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/
ADD --chown=jetty:jetty onboarding-be-*.war ${JETTY_BASE}/webapps/
ADD --chown=jetty:jetty api-docs.war ${JETTY_BASE}/webapps/
-USER root
+COPY --chown=jetty:jetty startup.sh ${JETTY_BASE}/
-COPY startup.sh /root/
+RUN chmod 770 ${JETTY_BASE}/startup.sh
-RUN chmod 770 /root/startup.sh
-
-ENTRYPOINT [ "/root/startup.sh" ]
+ENTRYPOINT ${JETTY_BASE}/startup.sh
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb
index c8102e43ee..8d77d61481 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb
@@ -6,7 +6,7 @@ else
port = "#{node['ONBOARDING_BE'][:http_port]}"
end
-template "/var/lib/ready-probe.sh" do
+template "/var/lib/jetty/ready-probe.sh" do
source "ready-probe.sh.erb"
sensitive true
mode 0755
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
index 413fdb317e..df8cefbd85 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-cd /root/chef-solo
+cd /var/lib/jetty/chef-solo
chef-solo -c solo.rb -E ${ENVNAME}
rc=$?
if [[ $rc != 0 ]]; then
@@ -21,4 +21,4 @@ cd /var/lib/jetty
/docker-entrypoint.sh &
-while true; do sleep 2; done \ No newline at end of file
+while true; do sleep 2; done
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
index 29189dbb4c..8dfc8a86f5 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
@@ -1,14 +1,13 @@
-FROM onap/base_sdc-cqlsh:1.5.0-SNAPSHOT-latest
+FROM onap/base_sdc-cqlsh:1.6.0-SNAPSHOT-latest
-COPY init_keyspaces.cql /root/
+COPY --chown=sdc:sdc init_keyspaces.cql /home/sdc/
-COPY init_schemas.cql /root/
+COPY --chown=sdc:sdc init_schemas.cql /home/sdc/
-COPY alter_tables.cql /root/
+COPY --chown=sdc:sdc alter_tables.cql /home/sdc/
-COPY startup.sh /root/
+COPY --chown=sdc:sdc startup.sh /home/sdc/
-RUN chmod 770 /root/startup.sh
-
-ENTRYPOINT [ "/root/startup.sh" ]
+RUN chmod 770 /home/sdc/startup.sh
+ENTRYPOINT [ "/home/sdc/startup.sh" ]
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
index 02354dbd6e..2f398b2f91 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-cd /root
+cd /home/sdc
CS_PORT=""
CS_HOST=127.0.0.1