diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2021-02-15 19:19:40 -0500 |
|---|---|---|
| committer | Jack Lucas <jflos@sonoris.net> | 2021-02-16 10:00:19 -0500 |
| commit | be3398d9d8348d2c5ba9a683a6601f4da7016f3c (patch) | |
| tree | 0f4d061cfc8595be3c14eb290774f4afd4066292 | |
| parent | 50887a105d9a68c54e35b41df35616c64e8cf631 (diff) | |
[BOOTSTRAP] Fix docker image build problem
Add installation of the Rust compiler to the Docker image build, to
satisfy a dependency of the "cloudify" command line Python package.
Issue-ID: DCAEGEN2-2628
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: Ic3efee5fca1282b2c312aeb7989242046e987c71
| -rw-r--r-- | Changelog.md | 6 | ||||
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 6 |
4 files changed, 17 insertions, 6 deletions
diff --git a/Changelog.md b/Changelog.md index cf61ecf..4bc1409 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,8 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [3.0.2] - 2021-02-15 +### Changed +- [DCAEGEN2-2628](https://jira.onap.org/browse/DCAEGEN2-2628) - Fix docker image build problem + ## [3.0.1] - 11/02/2021 ### Changed - [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade prh.prh-app-server to 1.5.5 - [DCAEGEN2-2493](https://jira.onap.org/browse/DCAEGEN2-2493) - RCC blueprint updated to use latest k8s plugin & 1.2.3 version (vulnerability fixes) - - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes) + - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes) @@ -34,8 +34,15 @@ RUN apk --no-cache add build-base libffi-dev openssl-dev curl bash RUN curl -Ssf -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" > /bin/jq \ && chmod +x /bin/jq +# Install rust (needed for "cryptography", needed for "cloudify" +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustinstall \ +&& chmod +x /rustinstall \ +&& /rustinstall -y + # Install pip and Cloudify CLI -RUN pip install cloudify==5.1.1 +RUN source /root/.cargo/env \ +&& pip install --upgrade pip \ +&& pip install cloudify==5.1.1 # Copy scripts RUN mkdir scripts @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> diff --git a/version.properties b/version.properties index f79400f..40a0e39 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ -major=2
-minor=2
-patch=4
+major=3
+minor=0
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
|