From b65d4c1fc374af0f4b3bb5ea55641efd88f65ab3 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Fri, 5 Feb 2021 12:10:28 -0500 Subject: Add yaml load and key delete to consul-loader-container Enhance Consul loader to: -- Convert YAML configuration files to JSON before storing the configuration into Consul -- Provide an option to delete a Consul key so that a component's configuration can be removed from Consul when the component is undeployed. Use the ONAP integration team's Python image (integration-python:8.0.0) as base image. Issue-ID: DCAEGEN2-2616 Issue-ID: DCAEGEN2-2488 Signed-off-by: Jack Lucas Change-Id: Iaa45a03e805f64e12881f142de2fa206fb816175 --- consul-loader-container/Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'consul-loader-container/Dockerfile') diff --git a/consul-loader-container/Dockerfile b/consul-loader-container/Dockerfile index 868b41f..741d5f3 100644 --- a/consul-loader-container/Dockerfile +++ b/consul-loader-container/Dockerfile @@ -2,6 +2,7 @@ # org.onap.dcae # ================================================================================ # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021 J. F. Lucas. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,8 +17,14 @@ # limitations under the License. # ============LICENSE_END========================================================= # -FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y curl && mkdir -p /opt/app -COPY *.sh /opt/app/ +FROM nexus3.onap.org:10001/onap/integration-python:8.0.0 +USER root +RUN apk update \ + && apk add bash \ + && apk add curl \ + && pip install --upgrade pip \ + && pip install pyyaml +COPY *.sh *.py /opt/app/ WORKDIR /opt/app ENTRYPOINT ["/opt/app/consul_store.sh"] +USER $user \ No newline at end of file -- cgit 1.2.3-korg