diff options
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | releases/2.0.6-container-release.yaml | 7 | ||||
| -rw-r--r-- | releases/2.0.7-container-release.yaml | 7 | ||||
| -rw-r--r-- | sparkybe-onap-application/pom.xml | 28 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/docker/Dockerfile | 21 | ||||
| -rwxr-xr-x[-rw-r--r--] | sparkybe-onap-application/src/main/scripts/start.sh | 2 | ||||
| -rw-r--r-- | sparkybe-onap-service/pom.xml | 4 | ||||
| -rw-r--r-- | version.properties | 2 |
8 files changed, 25 insertions, 48 deletions
@@ -12,7 +12,7 @@ <groupId>org.onap.aai</groupId> <artifactId>sparky-be</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.7-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-sparky-be</name> diff --git a/releases/2.0.6-container-release.yaml b/releases/2.0.6-container-release.yaml new file mode 100644 index 0000000..26959f7 --- /dev/null +++ b/releases/2.0.6-container-release.yaml @@ -0,0 +1,7 @@ +distribution_type: container +container_release_tag: 2.0.6 +project: aai/sparky-be +ref: bd4e712e29345655d2111c2c8e49ca5cda6c66e0 +containers: + - name: sparky-be + version: 2.0-STAGING-20241112T150612Z diff --git a/releases/2.0.7-container-release.yaml b/releases/2.0.7-container-release.yaml new file mode 100644 index 0000000..b54a713 --- /dev/null +++ b/releases/2.0.7-container-release.yaml @@ -0,0 +1,7 @@ +distribution_type: container +container_release_tag: 2.0.7 +project: aai/sparky-be +ref: 526a54490edd509819f24f7eed4a26a1312fa31f +containers: + - name: sparky-be + version: 2.0-STAGING-20250320T091948Z diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 5e21ea7..e8a5d05 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.aai</groupId> <artifactId>sparky-be</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.7-SNAPSHOT</version> </parent> <groupId>org.onap.aai.sparky-be</groupId> <artifactId>sparkybe-onap-application</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.7-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -35,8 +35,6 @@ <aai.build.directory>${project.build.directory}/${project.artifactId}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> - <aai.base.image>alpine</aai.base.image> - <aai.base.image.version>1.13.2</aai.base.image.version> <jacoco.line.coverage.limit>0.10</jacoco.line.coverage.limit> <!-- This will be used for the docker images as the default format of maven build has issues --> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> @@ -365,28 +363,6 @@ <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> <version>1.0</version> - <executions> - <execution> - <phase>pre-clean</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - def userAaiBaseImage = session.userProperties['aai.base.image'] - def userAaiCommonVersion = session.userProperties['aai.base.image.version'] - if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion - } - if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage - } - log.info 'Base image flavour: ' + project.properties['aai.base.image'] - log.info 'Base image version: ' + project.properties['aai.base.image.version'] - </source> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>io.fabric8</groupId> diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile index 6f95de0..39c9e91 100644 --- a/sparkybe-onap-application/src/main/docker/Dockerfile +++ b/sparkybe-onap-application/src/main/docker/Dockerfile @@ -1,24 +1,13 @@ -FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ - -ARG MICRO_HOME=/opt/app/sparky -ARG BIN_HOME=$MICRO_HOME/bin -ARG UI_LOGS=/var/log/onap/AAI-UI - -USER root +FROM eclipse-temurin:11-jre-alpine +USER nobody +ENV MICRO_HOME=/opt/app/sparky WORKDIR $MICRO_HOME -COPY --chown=aaiadmin:aaiadmin /maven/sparkybe-onap-application/ . - -# Build up the deployment folder structure -RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs $UI_LOGS && \ - chown -R aaiadmin:aaiadmin $MICRO_HOME/logs $UI_LOGS && \ - chmod 755 $BIN_HOME/* && \ - ln -snf /logs $MICRO_HOME/logs +COPY --chown=nobody:nobody /maven/sparkybe-onap-application/ . -USER aaiadmin EXPOSE 8000 8000 EXPOSE 9517 9517 -CMD ["/opt/app/sparky/bin/start.sh"] +CMD ["/bin/sh", "/opt/app/sparky/bin/start.sh"] diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh index 7faae8d..c478439 100644..100755 --- a/sparkybe-onap-application/src/main/scripts/start.sh +++ b/sparkybe-onap-application/src/main/scripts/start.sh @@ -5,8 +5,6 @@ CONFIG_HOME=${APP_HOME}/config PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME} -Dlogging.config=${CONFIG_HOME}/logging/logback.xml" -find ${MICRO_HOME} -name "*.sh" -exec chmod +x {} + - JAVA_CMD="exec java"; JAR_CMD="exec jar"; diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml index b6a6394..e872746 100644 --- a/sparkybe-onap-service/pom.xml +++ b/sparkybe-onap-service/pom.xml @@ -4,12 +4,12 @@ <parent> <groupId>org.onap.aai</groupId> <artifactId>sparky-be</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.7-SNAPSHOT</version> </parent> <groupId>org.onap.aai.sparky-be</groupId> <artifactId>sparkybe-onap-service</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.0.7-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/version.properties b/version.properties index 640b101..d4e7f68 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=2 minor=0 -patch=6 +patch=7 base_version=${major}.${minor}.${patch} |