Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions artifacts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion artifacts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<mock-sdk.fileName>mock-sdk.jar</mock-sdk.fileName>
<mock-sdk-dep.fileName>mock-sdk-jar-with-dependencies.jar</mock-sdk-dep.fileName>
<!-- image-compressor-->
<image-compressor.version>0.1.0-SNAPSHOT</image-compressor.version>
<image-compressor.version>0.1.0</image-compressor.version>
<image-compressor.location>/usr/share/nginx/html/artifactory/libs-release-local/compressor/image-compressor</image-compressor.location>
<image-compressor.fileName>image-compressor-jar-with-dependencies.jar</image-compressor.fileName>

Expand Down
2 changes: 1 addition & 1 deletion deploy/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/artifactory/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions helm/artifactory/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading