Commit b1c884aa authored by carignani's avatar carignani
Browse files

make docker pull images quietly

parent 6c9c3042

lint-data-models.sh

+4 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Copyright ETSI 2020



LOGFILE=yang-linting.log

DOCKER_IMG=hellt/pyang:2.1



echo "------ Switching to $1 folder --------"

cd $1
@@ -19,11 +20,12 @@ if [ ! $found_data_models ] ; then 
fi



echo "------ pyYANG Version ------"

docker run --rm -v $(pwd)/yang-models:/yang hellt/pyang:2.1 pyang --version

docker run --rm -v $(pwd)/yang-models:/yang "${DOCKER_IMG}" pyang --version



echo "------ Linting all YANG files ------"

#  Display all  errors and warnings to the user. Errors are allowed.

docker run --rm -v $(pwd)/yang-models:/yang hellt/pyang:2.1 "/bin/sh" -c 'pyang --lint -p external-yams _3gpp-*.yang' 2>>$LOGFILE >>$LOGFILE

docker pull -q "${DOCKER_IMG}"

docker run --rm -v $(pwd)/yang-models:/yang "${DOCKER_IMG}" "/bin/sh" -c 'pyang --lint -p external-yams _3gpp-*.yang' 2>>$LOGFILE >>$LOGFILE

ret=$?



echo "Output of Linting commad saved to $LOGFILE."

validate-all.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ DOCKER_IMAGE=etsiforge/swagger-cli:4.0.4 


if [ -x "$(command -v docker)" ] ; then

    RUN_IN_DOCKER=0

    docker pull "$DOCKER_IMAGE"

    echo "Using dockerized validator ($DOCKER_IMAGE)"

    docker pull -q "$DOCKER_IMAGE"

else

    RUN_IN_DOCKER=1

    if [ ! -x "$(command -v swagger-cli)" ] ; then

validate-data-models.sh

+8 −1
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2020



DOCKER_IMG=hellt/pyang:2.1



echo "------ Switching to $1 folder --------"

cd $1
@@ -17,8 +19,13 @@ if [ ! $found_data_models ] ; then 
fi



# This must run error-free and must display all warnings to the user

docker run --rm -v $(pwd)/yang-models:/yang hellt/pyang:2.1 "/bin/sh" -c 'pyang --strict -p external-yams _3gpp-*.yang'

docker pull -q "${DOCKER_IMG}"

docker run --rm -v $(pwd)/yang-models:/yang "${DOCKER_IMG}" "/bin/sh" -c 'pyang --strict -p external-yams _3gpp-*.yang'

ret=$?



if [ $ret == 0 ] ; then

    echo "No errors found by pyang --strict validation."

fi



exit $ret