From fcfcc9446730b2411459539ccbce8746277aac8f Mon Sep 17 00:00:00 2001 From: kwangsuk Date: Fri, 30 Oct 2020 15:47:23 -0700 Subject: [PATCH 1/4] update the sonic-cli script --- .../base_image_files/sonic-cli | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dockers/docker-sonic-mgmt-framework/base_image_files/sonic-cli b/dockers/docker-sonic-mgmt-framework/base_image_files/sonic-cli index 6675e3badbaf..12a22709590d 100755 --- a/dockers/docker-sonic-mgmt-framework/base_image_files/sonic-cli +++ b/dockers/docker-sonic-mgmt-framework/base_image_files/sonic-cli @@ -1,4 +1,21 @@ #!/bin/bash -docker exec -it mgmt-framework /usr/sbin/cli/clish_start "$@" - +# Disallow CLI for the root user, since we don't have auth certs for root +if [[ "$(id -u)" == 0 ]] +then + echo "FATAL: root cannot launch CLI" >&2 + exit 1 +fi +TIMEOUT=605 +if [[ "$1" =~ "prompt=" ]] +then + SYSTEM_NAME=`echo $1 | cut -d"=" -f2` + shift + docker exec -e SYSTEM_NAME=$SYSTEM_NAME -e CLI_USER="$USER" -u $(id -u):$(id -g) -it mgmt-framework /usr/sbin/cli/clish_start -t "$TIMEOUT" "$@" +else + docker exec -e CLI_USER="$USER" -e SYSTEM_NAME=$HOSTNAME -u $(id -u):$(id -g) -it mgmt-framework /usr/sbin/cli/clish_start -t "$TIMEOUT" "$@" +fi +ret=$? +if [ $ret -ne 0 ]; then + [[ -e /tmp/fast-reboot-progress || -e /tmp/reboot-progress ]] && sleep infinity +fi From 3aa981d12daf22db4da138345c034eaa48c66649 Mon Sep 17 00:00:00 2001 From: Kwan Kim Date: Thu, 5 Nov 2020 09:56:17 -0800 Subject: [PATCH 2/4] add dependent libraries for Klish upgrade --- dockers/docker-sonic-mgmt-framework/Dockerfile.j2 | 2 ++ sonic-slave-buster/Dockerfile.j2 | 3 ++- sonic-slave-stretch/Dockerfile.j2 | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 index 24ae3643b36e..b1c76a4c7cf5 100644 --- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 @@ -17,6 +17,8 @@ RUN pip install connexion==1.1.15 \ six==1.11.0 \ urllib3==1.21.1 +RUN apt-get -y install libcurl3-gnutls libpython2.7 + COPY \ {% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%} debs/{{ deb }}{{' '}} diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 03dae31ecd46..862daf40f440 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -305,7 +305,8 @@ RUN apt-get update && apt-get install -y \ libxml2-utils \ xsltproc \ python-lxml \ - libexpat1-dev + libexpat1-dev \ + libcurl3-gnutls ## Config dpkg ## install the configuration file if it’s currently missing diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index 276bdcbbc1dd..19b313d9a886 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -298,7 +298,8 @@ RUN apt-get update && apt-get install -y \ libxml2-utils \ xsltproc \ python-lxml \ - libexpat1-dev + libexpat1-dev \ + libcurl3-gnutls ## Config dpkg ## install the configuration file if it’s currently missing From d3b119128776f47ca84e9089d766b5ab93e854fa Mon Sep 17 00:00:00 2001 From: Kwan Kim Date: Thu, 12 Nov 2020 18:25:12 -0800 Subject: [PATCH 3/4] add the dependent package libcjson --- dockers/docker-sonic-mgmt-framework/Dockerfile.j2 | 2 +- sonic-slave-buster/Dockerfile.j2 | 3 ++- sonic-slave-stretch/Dockerfile.j2 | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 index b1c76a4c7cf5..4c8dd478a9a3 100644 --- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 @@ -7,7 +7,7 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y g++ python-dev libxml2 + apt-get install -y g++ python-dev libxml2 libcurl3-gnutls libpython2.7 libcjson-dev RUN pip install connexion==1.1.15 \ setuptools==21.0.0 \ diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 862daf40f440..7e1290e986a2 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -306,7 +306,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ python-lxml \ libexpat1-dev \ - libcurl3-gnutls + libcurl3-gnutls \ + libcjson-dev ## Config dpkg ## install the configuration file if it’s currently missing diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index 19b313d9a886..276bdcbbc1dd 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -298,8 +298,7 @@ RUN apt-get update && apt-get install -y \ libxml2-utils \ xsltproc \ python-lxml \ - libexpat1-dev \ - libcurl3-gnutls + libexpat1-dev ## Config dpkg ## install the configuration file if it’s currently missing From 55c5126618de0115198856f5a2d6fd76fbfd1997 Mon Sep 17 00:00:00 2001 From: Kwan Kim Date: Thu, 12 Nov 2020 21:36:58 -0800 Subject: [PATCH 4/4] remove redudandt install --- dockers/docker-sonic-mgmt-framework/Dockerfile.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 index 4c8dd478a9a3..735623aa20ee 100644 --- a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 @@ -17,8 +17,6 @@ RUN pip install connexion==1.1.15 \ six==1.11.0 \ urllib3==1.21.1 -RUN apt-get -y install libcurl3-gnutls libpython2.7 - COPY \ {% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%} debs/{{ deb }}{{' '}}