diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile index 858b491e..b96bfd7c 100644 --- a/artifacts/Dockerfile +++ b/artifacts/Dockerfile @@ -28,8 +28,10 @@ apt-get update -y && \ apt-get install -y --no-install-recommends unzip wget zip openjdk-11-jdk && \ groupadd -g ${container_user_gid} ${container_user_group} &&\ rm -rf /var/lib/apt/lists/* &&\ -wget https://dlcdn.apache.org/maven/maven-3/3.8.9/binaries/apache-maven-3.8.9-bin.tar.gz &&\ -tar -xzf apache-maven-3.8.9-bin.tar.gz && mv apache-maven-3.8.9 /usr/local/maven && rm apache-maven-3.8.9-bin.tar.gz &&\ +wget https://dlcdn.apache.org/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.tar.gz && \ +tar -xzf apache-maven-3.9.16-bin.tar.gz && \ +mv apache-maven-3.9.16 /usr/local/maven && \ +rm apache-maven-3.9.16-bin.tar.gz && \ useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ && mkdir -p /var/run/nginx /var/tmp/nginx \ && chown -R ${container_user}:${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx diff --git a/artifacts/pom.xml b/artifacts/pom.xml index aaa26575..9b765651 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -117,7 +117,7 @@ mock-sdk.jar mock-sdk-jar-with-dependencies.jar - 0.1.0-SNAPSHOT + 0.1.0 /usr/share/nginx/html/artifactory/libs-release-local/compressor/image-compressor image-compressor-jar-with-dependencies.jar diff --git a/deploy/install.sh b/deploy/install.sh index 444caee9..299e6dc5 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=artifactory -CHART_VERSION=1.3.0 +CHART_VERSION=1.3.1-develop echo Create $NS namespace kubectl create ns $NS diff --git a/helm/artifactory/Chart.yaml b/helm/artifactory/Chart.yaml index e6f62cef..254ffbfa 100644 --- a/helm/artifactory/Chart.yaml +++ b/helm/artifactory/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: artifactory description: A Helm chart for MOSIP Artifactory type: application -version: 1.3.0 +version: 1.3.1-develop appVersion: "" dependencies: - name: common diff --git a/helm/artifactory/values.yaml b/helm/artifactory/values.yaml index a38ae4e8..6956b00d 100644 --- a/helm/artifactory/values.yaml +++ b/helm/artifactory/values.yaml @@ -46,8 +46,8 @@ service: ## with biosdk 'develop' version. TODO: Change this later image: registry: docker.io - repository: mosipid/artifactory-server - tag: 1.3.0 + repository: mosipqa/artifactory-server + tag: 1.3.x ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images