diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2018-08-17 12:58:51 +0000 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2018-08-17 12:59:18 +0000 |
| commit | b3350fa9629b558c5bdba5ff8d5e5d670d150204 (patch) | |
| tree | 685408c5be271694b14186faf5e28197615b271a /k8s-bootstrap-container/Dockerfile-template | |
| parent | 960fb86f0baf3d24a2b56d487fdfa7d25e847961 (diff) | |
Add code to enhance k8s bootstrap
- Make bootstrap container continue to run after initial bootstrap done
- Do deployments in parallel where feasible
- Accommodate deployments with no input files
- Test to see if actions (uploads, installs, etc.) are needed before doing them
Issue-ID: DCAEGEN2-594
Change-Id: Ie188c1fd69695479593aa82b516e5504a849099c
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'k8s-bootstrap-container/Dockerfile-template')
| -rw-r--r-- | k8s-bootstrap-container/Dockerfile-template | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/k8s-bootstrap-container/Dockerfile-template b/k8s-bootstrap-container/Dockerfile-template index 26bc9a1..55e64f0 100644 --- a/k8s-bootstrap-container/Dockerfile-template +++ b/k8s-bootstrap-container/Dockerfile-template @@ -27,23 +27,39 @@ ENV BP_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_rel # Install gcc RUN yum install -y gcc python-devel +# Install Consul +RUN yum install -y unzip \ + && mkdir -p /opt/consul/bin \ + && mkdir -p /opt/consul/data \ + && mkdir -p /opt/consul/config \ + && curl -Ss https://releases.hashicorp.com/consul/1.2.1/consul_1.2.1_linux_amd64.zip > /tmp/consul.zip \ + && unzip -pj /tmp/consul.zip > /opt/consul/bin/consul \ + && chmod +x /opt/consul/bin/consul +COPY 00-consul.json /opt/consul/config/ + +# Install jq +RUN curl -Ss -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" > /bin/jq \ +&& chmod +x /bin/jq + # Install pip RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ && pip install cloudify==4.2 -# Get plugin archives and build wagons +# Copy scripts RUN mkdir scripts -COPY build-plugins.sh scripts +COPY build-plugins.sh load-blueprints.sh bootstrap.sh uninstall.sh scripts/ +RUN chmod +x /scripts/*.sh + +# Get plugin archives and build wagons RUN scripts/build-plugins.sh ${DCAE_REPO} ${CCSDK_REPO} \ && rm scripts/build-plugins.sh # Load blueprints and input templates -COPY load-blueprints.sh scripts RUN scripts/load-blueprints.sh ${BP_REPO} \ && rm scripts/load-blueprints.sh + # Set up runtime script -COPY bootstrap.sh scripts ENTRYPOINT exec "/scripts/bootstrap.sh" |