From: Kate Hsuan Date: Mon, 2 Mar 2020 08:54:04 +0000 (+0000) Subject: Switch from cloudify helm plugin to cloudify/tosca. X-Git-Tag: 2.0.0~1^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3034e7cd569faea033c9a309b3318c7e51c1ba9e;p=dcaegen2%2Fservices.git Switch from cloudify helm plugin to cloudify/tosca. 1. Blueprint implementation. 2. Modify startup sequence. Issue-ID: DCAEGEN2-2098 Signed-off-by: Kate Hsuan Change-Id: I9d3d56565b0e997d3150eeef0891cc79bb0519ae --- diff --git a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf index 56e0a51e..9551a1db 100644 --- a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf +++ b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf @@ -4,7 +4,7 @@ server { location ~/datalake/v1(.*)$ { resolver 127.0.0.1 valid=10s; - set $upstreamName http://dl_feeder:1680/datalake/v1$1; + set $upstreamName http://dl-feeder:1680/datalake/v1$1; proxy_pass $upstreamName; proxy_ssl_server_name on; diff --git a/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml b/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml deleted file mode 100644 index c343f9c7..00000000 --- a/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# ============LICENSE_START========================================== -# =================================================================== -# Copyright (c) 2020 QCT -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END============================================ - -tiller-server-ip: 10.103.11.87 -tiller-server-port: 31867 -namespace: onap -chart-repo-url: http://10.103.11.87:8879/charts -stable-repo-url: http://127.0.0.1:8879 -chart-version: 1.0.0 -component-name: dcae-datalake diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/Chart.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/Chart.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/Chart.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml similarity index 95% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml index a47e7d0a..cb6b7be8 100644 --- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml +++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml @@ -22,7 +22,7 @@ replicaCount: 1 image: - repository: nexus3.onap.org:10001/v2/onap/org.onap.dcaegen2.services.datalakeadminui + repository: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui tag: 1.0.0 pullPolicy: IfNotPresent diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml similarity index 83% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml index 4c9dffcd..a8762291 100644 --- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml +++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml @@ -39,21 +39,6 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - initContainers: - - command: - - /root/job_complete.py - args: - - -j - - {{ .Release.Name }}-dcae-datalake-feeder-dbinit-job - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: datalake-readiness containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/values.yaml similarity index 100% rename from components/datalake-handler/dpo/helm_chart/dcae-datalake/values.yaml rename to components/datalake-handler/dpo/helm-chart/dcae-datalake/values.yaml diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml b/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml deleted file mode 100644 index a990fb75..00000000 --- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# ============LICENSE_START========================================== -# =================================================================== -# Copyright (c) 2020 QCT -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END============================================ - -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ include "dcae-datalake-feeder.fullname" . }}-dbinit-job - labels: -{{ include "dcae-datalake-feeder.labels" . | indent 4 }} -spec: - template: - spec: - #initContainers: - #- name: datalake-readiness - #command: - #- /root/ready.py - #args: - #- --container-name - #- {{ .Values.config.mariadbGalera.chartName }} - #env: - #- name: NAMESPACE - # valueFrom: - # fieldRef: - # apiVersion: v1 - # fieldPath: metadata.namespace - #image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - #imagePullPolicy: Always - - containers: - - name: datalake-db-init - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalake.dbinit:1.0.0 - env: - - name: MYSQL_HOST - value: "{{ .Values.config.mariadbGalera.serviceName }}" - - name: MYSQL_PORT - value: "3306" - - name: MYSQL_ROOT_PASSWORD - value: "secretpassword" - - name: PRESTO_HOST - value: "{{ .Values.config.presto.serviceName }}" - command: ["sh", "run.sh"] - restartPolicy: Never - backoffLimit: 4 diff --git a/components/datalake-handler/feeder/Dockerfile b/components/datalake-handler/feeder/Dockerfile index 20444f97..e2606352 100644 --- a/components/datalake-handler/feeder/Dockerfile +++ b/components/datalake-handler/feeder/Dockerfile @@ -15,5 +15,17 @@ WORKDIR /home/datalake COPY target/${JAR_FILE} /home/datalake/ COPY src/assembly/run.sh /home/datalake/ +WORKDIR /home/datalake/db_init +ADD src/assembly/init_db/scripts/db_init . +USER root +RUN chmod 0755 ./* +WORKDIR /home/datalake +COPY src/assembly/init_db/db_scripts/init_db.sql . +COPY src/assembly/init_db/db_scripts/init_db_data.sql . + +RUN apt update && \ + apt install -y mariadb-client && \ + apt install -y curl + CMD ["sh", "run.sh"] diff --git a/components/datalake-handler/init_db/db_scripts/init_db.sql b/components/datalake-handler/feeder/src/assembly/init_db/db_scripts/init_db.sql similarity index 100% rename from components/datalake-handler/init_db/db_scripts/init_db.sql rename to components/datalake-handler/feeder/src/assembly/init_db/db_scripts/init_db.sql diff --git a/components/datalake-handler/init_db/db_scripts/init_db_data.sql b/components/datalake-handler/feeder/src/assembly/init_db/db_scripts/init_db_data.sql similarity index 99% rename from components/datalake-handler/init_db/db_scripts/init_db_data.sql rename to components/datalake-handler/feeder/src/assembly/init_db/db_scripts/init_db_data.sql index 7857d3ee..bc377348 100644 --- a/components/datalake-handler/init_db/db_scripts/init_db_data.sql +++ b/components/datalake-handler/feeder/src/assembly/init_db/db_scripts/init_db_data.sql @@ -43,7 +43,7 @@ INSERT INTO kafka( ,'message-router-kafka:9092' -- host_port - IN varchar(255) ,'' -- included_topic - IN varchar(255) ,'admin' -- login - IN varchar(255) - ,'admin-secret' -- pass - IN varchar(255) + ,'admin_secret' -- pass - IN varchar(255) ,0 -- secure - IN bit(1) ,'SASL_PLAINTEXT' -- security_protocol - IN varchar(255) ,10 -- timeout_sec - IN int(11) diff --git a/components/datalake-handler/init_db/scripts/db_init/10_check-db-exist b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/10_check-db-exist similarity index 100% rename from components/datalake-handler/init_db/scripts/db_init/10_check-db-exist rename to components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/10_check-db-exist diff --git a/components/datalake-handler/init_db/scripts/db_init/11_create-database b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database similarity index 89% rename from components/datalake-handler/init_db/scripts/db_init/11_create-database rename to components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database index 3e34828f..a43b0cf2 100644 --- a/components/datalake-handler/init_db/scripts/db_init/11_create-database +++ b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database @@ -22,4 +22,4 @@ if [ -f "/tmp/db_exist" ]; then exit 0 fi -cat /app/init_db.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 +cat /home/datalake/init_db.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 diff --git a/components/datalake-handler/init_db/scripts/db_init/15_db-adduser b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/15_db-adduser similarity index 100% rename from components/datalake-handler/init_db/scripts/db_init/15_db-adduser rename to components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/15_db-adduser diff --git a/components/datalake-handler/init_db/scripts/db_init/20_db-initdb b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb similarity index 89% rename from components/datalake-handler/init_db/scripts/db_init/20_db-initdb rename to components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb index 3b6d340f..ad8f6f89 100644 --- a/components/datalake-handler/init_db/scripts/db_init/20_db-initdb +++ b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb @@ -22,4 +22,4 @@ if [ -f "/tmp/db_exist" ]; then exit 0 fi -cat /app/init_db_data.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 +cat /home/datalake/init_db_data.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 diff --git a/components/datalake-handler/init_db/scripts/run.sh b/components/datalake-handler/feeder/src/assembly/init_db/scripts/run.sh similarity index 100% rename from components/datalake-handler/init_db/scripts/run.sh rename to components/datalake-handler/feeder/src/assembly/init_db/scripts/run.sh diff --git a/components/datalake-handler/feeder/src/assembly/run.sh b/components/datalake-handler/feeder/src/assembly/run.sh index 377f208a..a061bfcf 100644 --- a/components/datalake-handler/feeder/src/assembly/run.sh +++ b/components/datalake-handler/feeder/src/assembly/run.sh @@ -1,3 +1,15 @@ #!/bin/sh -java -jar feeder-1.0.0-SNAPSHOT.jar \ No newline at end of file +echo "start init db ..." + +/bin/run-parts /home/datalake/db_init + +echo "finish init db" + +cmd=`ls feeder-*.jar` +if [ -z "$cmd" ]; then + echo "STRING is empty" + sleep 10000 +else + java -jar $cmd +fi diff --git a/components/datalake-handler/feeder/src/main/resources/application.properties b/components/datalake-handler/feeder/src/main/resources/application.properties index c7a040cf..bc24cdb2 100644 --- a/components/datalake-handler/feeder/src/main/resources/application.properties +++ b/components/datalake-handler/feeder/src/main/resources/application.properties @@ -20,7 +20,7 @@ spring.jpa.hibernate.ddl-auto=none spring.jpa.show-sql=false #spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mariadb://dl-mariadb:3306/datalake?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url=jdbc:mariadb://mariadb-galera:3306/datalake?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=dl spring.datasource.password=dl1234 @@ -70,4 +70,4 @@ kibanaPort=5601 esTemplateMappingApi=/_template/ #####################Elasticsearch port -esPort=9200 \ No newline at end of file +esPort=9200 diff --git a/components/datalake-handler/init_db/Dockerfile b/components/datalake-handler/init_db/Dockerfile deleted file mode 100644 index cf6aed2d..00000000 --- a/components/datalake-handler/init_db/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -# ============LICENSE_START========================================== -# =================================================================== -# Copyright (c) 2020 QCT -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============LICENSE_END============================================ - -FROM ubuntu:16.04 AS builder -MAINTAINER Kate Hsuan - -LABEL org.label-schema.docker.build="docker build -t dl-db-init . --no-cache" \ - org.label-schema.docker.run="docker run dl-init" - -WORKDIR /app -WORKDIR /app/db_init -ADD scripts/db_init/ . -RUN chmod 0755 ./* -WORKDIR /app -COPY scripts/run.sh . -COPY db_scripts/init_db.sql . -COPY db_scripts/init_db_data.sql . - -RUN chmod 0755 /app/run.sh - -ARG mysqlpasswd="0000" -ENV MYSQL_ROOT_PASSWORD=$mysqlpasswd - -ARG mysqlhost="mariadb-galera" -ENV MYSQL_HOST=$mysqlhost - -ARG mysqlport="3306" -ENV MYSQL_PORT=${mysqlport} - -RUN apt update && \ - apt install -y mariadb-client-core-10.0 && \ - apt install -y curl - -CMD ["sh", "run.sh"] diff --git a/components/datalake-handler/init_db/pom.xml b/components/datalake-handler/init_db/pom.xml deleted file mode 100644 index 0c63933b..00000000 --- a/components/datalake-handler/init_db/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - - org.onap.dcaegen2.services.components - datalake-handler - 1.0.0-SNAPSHOT - - - org.onap.dcaegen2.services.components.datalake-handler - init_db - pom - - 2.9.2 - 1.4.5 - onap/org.onap.dcaegen2.services.datalake.dbinit - - DataLake db init - - - - - com.spotify - dockerfile-maven-plugin - ${dockerfile-maven.version} - - ${onap.nexus.dockerregistry.daily}/${docker.image.path} - ${project.version} - Dockerfile - true - - - - javax.activation - javax.activation-api - 1.2.0 - - - - - -