diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2020-06-19 13:18:14 -0700 |
|---|---|---|
| committer | Ritu Sood <ritu.sood@intel.com> | 2020-06-19 13:28:08 -0700 |
| commit | 1f6c1d5d3750fbcfaadd1788ac47f28dd3708423 (patch) | |
| tree | 000df495e815c574850fe0ee4585dcb378d0fe75 | |
| parent | 7b860ae60bf9686b449ab2fe3f18c33944bdd71c (diff) | |
Update to fix inconsistent naming
Dockerfile and Kunernetes resource files
use inconsistent names. This patch is to
fix inconsistent names.
Issue-ID: MULTICLOUD-1065
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Change-Id: If7ea6d9ecf55196be5400ea5d2b4d3ce42f99b0f
| -rw-r--r-- | build/Dockerfile | 22 | ||||
| -rw-r--r-- | build/Readme.md | 7 | ||||
| -rwxr-xr-x | build/entrypoint | 2 | ||||
| -rw-r--r-- | deployments/kubernetes/onap4k8s.yaml | 40 |
4 files changed, 37 insertions, 34 deletions
diff --git a/build/Dockerfile b/build/Dockerfile index ff9e8572..02031928 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,18 +20,18 @@ RUN cd src/clm && make all FROM ubuntu:16.04 -WORKDIR /opt/mco -RUN groupadd -r mco && useradd -r -g mco mco -RUN chown mco:mco /opt/mco -R -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/orchestrator/orchestrator ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ncm/ncm ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/dcm/dcm ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/rsync/rsync ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ovnaction/ovnaction ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/clm/clm ./ -COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/build/entrypoint ./ +WORKDIR /opt/emco +RUN groupadd -r emco && useradd -r -g emco emco +RUN chown emco:emco /opt/emco -R +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/orchestrator/orchestrator ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ncm/ncm ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/dcm/dcm ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/rsync/rsync ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ovnaction/ovnaction ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/clm/clm ./ +COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/build/entrypoint ./ -USER mco +USER emco ENTRYPOINT ["./entrypoint"] diff --git a/build/Readme.md b/build/Readme.md index 193c0ea5..afc7cd03 100644 --- a/build/Readme.md +++ b/build/Readme.md @@ -1,4 +1,7 @@ +########################################## # Steps for building v2 API Docker Image -$cd k8s -$docker build -f build/Dockerfile . -t mco +########################################## + `$cd k8s` + + `$docker build -f build/Dockerfile . -t emco` diff --git a/build/entrypoint b/build/entrypoint index bafb76e9..d711f0f6 100755 --- a/build/entrypoint +++ b/build/entrypoint @@ -3,7 +3,7 @@ cmd=${1:-""} case ${cmd} in - "mco") + "orchestrator") ./orchestrator ;; diff --git a/deployments/kubernetes/onap4k8s.yaml b/deployments/kubernetes/onap4k8s.yaml index 302fd53e..1bd4ce94 100644 --- a/deployments/kubernetes/onap4k8s.yaml +++ b/deployments/kubernetes/onap4k8s.yaml @@ -52,15 +52,15 @@ spec: spec: containers: - name: orchestrator - image: rtsood/mco:0.0.1 + image: rtsood/emco:0.0.1 imagePullPolicy: IfNotPresent - command: ["/opt/mco/entrypoint", "mco"] - workingDir: /opt/mco + command: ["/opt/emco/entrypoint", "orchestrator"] + workingDir: /opt/emco ports: - containerPort: 9015 volumeMounts: - name: config - mountPath: /opt/mco/config.json + mountPath: /opt/emco/config.json subPath: config.json volumes: - name: config @@ -123,15 +123,15 @@ spec: spec: containers: - name: ncm - image: rtsood/mco:0.0.1 + image: rtsood/emco:0.0.1 imagePullPolicy: IfNotPresent - command: ["/opt/mco/entrypoint", "ncm"] - workingDir: /opt/mco + command: ["/opt/emco/entrypoint", "ncm"] + workingDir: /opt/emco ports: - containerPort: 9031 volumeMounts: - name: config - mountPath: /opt/mco/config.json + mountPath: /opt/emco/config.json subPath: config.json volumes: - name: config @@ -193,15 +193,15 @@ spec: spec: containers: - name: rsync - image: rtsood/mco:0.0.1 + image: rtsood/emco:0.0.1 imagePullPolicy: IfNotPresent - command: ["/opt/mco/entrypoint", "rsync"] - workingDir: /opt/mco + command: ["/opt/emco/entrypoint", "rsync"] + workingDir: /opt/emco ports: - containerPort: 9041 volumeMounts: - name: config - mountPath: /opt/mco/config.json + mountPath: /opt/emco/config.json subPath: config.json volumes: - name: config @@ -267,16 +267,16 @@ spec: spec: containers: - name: ovnaction - image: rtsood/mco:0.0.1 + image: rtsood/emco:0.0.1 imagePullPolicy: IfNotPresent - command: ["/opt/mco/entrypoint", "ovnaction"] - workingDir: /opt/mco + command: ["/opt/emco/entrypoint", "ovnaction"] + workingDir: /opt/emco ports: - containerPort: 9053 - containerPort: 9051 volumeMounts: - name: config - mountPath: /opt/mco/config.json + mountPath: /opt/emco/config.json subPath: config.json volumes: - name: config @@ -339,15 +339,15 @@ spec: spec: containers: - name: clm - image: rtsood/mco:0.0.1 + image: rtsood/emco:0.0.1 imagePullPolicy: IfNotPresent - command: ["/opt/mco/entrypoint", "clm"] - workingDir: /opt/mco + command: ["/opt/emco/entrypoint", "clm"] + workingDir: /opt/emco ports: - containerPort: 9061 volumeMounts: - name: config - mountPath: /opt/mco/config.json + mountPath: /opt/emco/config.json subPath: config.json volumes: - name: config |