diff mbox series

[isar-cip-core] kas-container: update kas to 3.2.3

Message ID 20230529063356.2292070-1-srinuvasan_a@mentor.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] kas-container: update kas to 3.2.3 | expand

Commit Message

Srinuvasan Arjunan May 29, 2023, 6:33 a.m. UTC 
From: Srinuvasan A <srinuvasan.a@siemens.com>

Update kas-container to latest one.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 .gitlab-ci.yml |  2 +-
 kas-container  | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

Comments

Jan Kiszka May 30, 2023, 6:32 a.m. UTC | #1 
On 29.05.23 08:33, Srinuvasan Arjunan wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Update kas-container to latest one.
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  .gitlab-ci.yml |  2 +-
>  kas-container  | 20 ++++++++++----------
>  2 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 6c82bb7..892ba92 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -12,7 +12,7 @@
>  # SPDX-License-Identifier: MIT
>  #
>  
> -image: ghcr.io/siemens/kas/kas-isar:3.2.2
> +image: ghcr.io/siemens/kas/kas-isar:3.2.3
>  
>  variables:
>    GIT_STRATEGY: clone
> diff --git a/kas-container b/kas-container
> index cad4290..123198c 100755
> --- a/kas-container
> +++ b/kas-container
> @@ -134,7 +134,7 @@ run_clean() {
>  	fi
>  }
>  
> -KAS_IMAGE_VERSION_DEFAULT="3.2.2"
> +KAS_IMAGE_VERSION_DEFAULT="3.2.3"
>  KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas"
>  KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas"
>  
> @@ -411,7 +411,7 @@ if [ -n "${KAS_SSH_DIR}" ] ; then
>  		echo "Passed KAS_SSH_DIR '${KAS_SSH_DIR}' is not a directory"
>  		exit 1
>  	fi
> -	set -- "$@" -v "$(readlink -f "${KAS_SSH_DIR}")":/etc/skel/.ssh:ro
> +	set -- "$@" -v "$(readlink -f "${KAS_SSH_DIR}")":/var/kas/userdata/.ssh:ro
>  fi
>  
>  if [ -n "${KAS_SSH_AUTH_SOCK}" ]; then
> @@ -428,9 +428,9 @@ if [ -n "${KAS_AWS_DIR}" ] ; then
>  		echo "Passed KAS_AWS_DIR '${KAS_AWS_DIR}' is not a directory"
>  		exit 1
>  	fi
> -	set -- "$@" -v "$(readlink -f "${KAS_AWS_DIR}")":/etc/skel/.aws:ro \
> -		-e AWS_CONFIG_FILE="${AWS_CONFIG_FILE:-/etc/skel/.aws/config}" \
> -		-e AWS_SHARED_CREDENTIALS_FILE="${AWS_SHARED_CREDENTIALS_FILE:-/etc/skel/.aws/credentials}"
> +	set -- "$@" -v "$(readlink -f "${KAS_AWS_DIR}")":/var/kas/userdata/.aws:ro \
> +		-e AWS_CONFIG_FILE="${AWS_CONFIG_FILE:-/var/kas/userdata/.aws/config}" \
> +		-e AWS_SHARED_CREDENTIALS_FILE="${AWS_SHARED_CREDENTIALS_FILE:-/var/kas/userdata/.aws/credentials}"
>  fi
>  
>  KAS_GIT_CREDENTIAL_HELPER_DEFAULT=""
> @@ -440,8 +440,8 @@ if [ -n "${KAS_GIT_CREDENTIAL_STORE}" ] ; then
>  		echo "Passed KAS_GIT_CREDENTIAL_STORE '${KAS_GIT_CREDENTIAL_STORE}' is not a file"
>  		exit 1
>  	fi
> -	KAS_GIT_CREDENTIAL_HELPER_DEFAULT="store --file=/etc/skel/.git-credentials"
> -	set -- "$@" -v "$(readlink -f "${KAS_GIT_CREDENTIAL_STORE}")":/etc/skel/.git-credentials:ro
> +	KAS_GIT_CREDENTIAL_HELPER_DEFAULT="store --file=/var/kas/userdata/.git-credentials"
> +	set -- "$@" -v "$(readlink -f "${KAS_GIT_CREDENTIAL_STORE}")":/var/kas/userdata/.git-credentials:ro
>  fi
>  
>  GIT_CREDENTIAL_HELPER="${GIT_CREDENTIAL_HELPER:-${KAS_GIT_CREDENTIAL_HELPER_DEFAULT}}"
> @@ -451,8 +451,8 @@ if [ -n "${GIT_CREDENTIAL_HELPER}" ] ; then
>  fi
>  
>  if [ -f "${NETRC_FILE}" ]; then
> -	set -- "$@" -v "$(readlink -f "${NETRC_FILE}")":/etc/skel/.netrc:ro \
> -		-e NETRC_FILE="/etc/skel/.netrc"
> +	set -- "$@" -v "$(readlink -f "${NETRC_FILE}")":/var/kas/userdata/.netrc:ro \
> +		-e NETRC_FILE="/var/kas/userdata/.netrc"
>  fi
>  
>  if [ -t 1 ]; then
> @@ -479,7 +479,7 @@ if [ -n "${KAS_REPO_REF_DIR}" ]; then
>  		exit 1
>  	fi
>  	set -- "$@" \
> -		-v "$(readlink -f "${KAS_REPO_REF_DIR}")":/repo-ref:ro \
> +		-v "$(readlink -f "${KAS_REPO_REF_DIR}")":/repo-ref:rw \
>  		-e KAS_REPO_REF_DIR=/repo-ref
>  fi
>  

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c82bb7..892ba92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ 
 # SPDX-License-Identifier: MIT
 #
 
-image: ghcr.io/siemens/kas/kas-isar:3.2.2
+image: ghcr.io/siemens/kas/kas-isar:3.2.3
 
 variables:
   GIT_STRATEGY: clone
diff --git a/kas-container b/kas-container
index cad4290..123198c 100755
--- a/kas-container
+++ b/kas-container
@@ -134,7 +134,7 @@  run_clean() {
 	fi
 }
 
-KAS_IMAGE_VERSION_DEFAULT="3.2.2"
+KAS_IMAGE_VERSION_DEFAULT="3.2.3"
 KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas"
 KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas"
 
@@ -411,7 +411,7 @@  if [ -n "${KAS_SSH_DIR}" ] ; then
 		echo "Passed KAS_SSH_DIR '${KAS_SSH_DIR}' is not a directory"
 		exit 1
 	fi
-	set -- "$@" -v "$(readlink -f "${KAS_SSH_DIR}")":/etc/skel/.ssh:ro
+	set -- "$@" -v "$(readlink -f "${KAS_SSH_DIR}")":/var/kas/userdata/.ssh:ro
 fi
 
 if [ -n "${KAS_SSH_AUTH_SOCK}" ]; then
@@ -428,9 +428,9 @@  if [ -n "${KAS_AWS_DIR}" ] ; then
 		echo "Passed KAS_AWS_DIR '${KAS_AWS_DIR}' is not a directory"
 		exit 1
 	fi
-	set -- "$@" -v "$(readlink -f "${KAS_AWS_DIR}")":/etc/skel/.aws:ro \
-		-e AWS_CONFIG_FILE="${AWS_CONFIG_FILE:-/etc/skel/.aws/config}" \
-		-e AWS_SHARED_CREDENTIALS_FILE="${AWS_SHARED_CREDENTIALS_FILE:-/etc/skel/.aws/credentials}"
+	set -- "$@" -v "$(readlink -f "${KAS_AWS_DIR}")":/var/kas/userdata/.aws:ro \
+		-e AWS_CONFIG_FILE="${AWS_CONFIG_FILE:-/var/kas/userdata/.aws/config}" \
+		-e AWS_SHARED_CREDENTIALS_FILE="${AWS_SHARED_CREDENTIALS_FILE:-/var/kas/userdata/.aws/credentials}"
 fi
 
 KAS_GIT_CREDENTIAL_HELPER_DEFAULT=""
@@ -440,8 +440,8 @@  if [ -n "${KAS_GIT_CREDENTIAL_STORE}" ] ; then
 		echo "Passed KAS_GIT_CREDENTIAL_STORE '${KAS_GIT_CREDENTIAL_STORE}' is not a file"
 		exit 1
 	fi
-	KAS_GIT_CREDENTIAL_HELPER_DEFAULT="store --file=/etc/skel/.git-credentials"
-	set -- "$@" -v "$(readlink -f "${KAS_GIT_CREDENTIAL_STORE}")":/etc/skel/.git-credentials:ro
+	KAS_GIT_CREDENTIAL_HELPER_DEFAULT="store --file=/var/kas/userdata/.git-credentials"
+	set -- "$@" -v "$(readlink -f "${KAS_GIT_CREDENTIAL_STORE}")":/var/kas/userdata/.git-credentials:ro
 fi
 
 GIT_CREDENTIAL_HELPER="${GIT_CREDENTIAL_HELPER:-${KAS_GIT_CREDENTIAL_HELPER_DEFAULT}}"
@@ -451,8 +451,8 @@  if [ -n "${GIT_CREDENTIAL_HELPER}" ] ; then
 fi
 
 if [ -f "${NETRC_FILE}" ]; then
-	set -- "$@" -v "$(readlink -f "${NETRC_FILE}")":/etc/skel/.netrc:ro \
-		-e NETRC_FILE="/etc/skel/.netrc"
+	set -- "$@" -v "$(readlink -f "${NETRC_FILE}")":/var/kas/userdata/.netrc:ro \
+		-e NETRC_FILE="/var/kas/userdata/.netrc"
 fi
 
 if [ -t 1 ]; then
@@ -479,7 +479,7 @@  if [ -n "${KAS_REPO_REF_DIR}" ]; then
 		exit 1
 	fi
 	set -- "$@" \
-		-v "$(readlink -f "${KAS_REPO_REF_DIR}")":/repo-ref:ro \
+		-v "$(readlink -f "${KAS_REPO_REF_DIR}")":/repo-ref:rw \
 		-e KAS_REPO_REF_DIR=/repo-ref
 fi