From 03e61247159837b566b0cfcc380606dc317fbf1a Mon Sep 17 00:00:00 2001 From: Petr Ospalý Date: Thu, 3 Jan 2019 16:54:50 +0100 Subject: Fix whitespaces across the bash scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8f3912f1b7f35aa889ce63592b30014d6433a82f Issue-ID: OOM-1551 Signed-off-by: Petr Ospalý --- bash/tools/create_si_cacert_pkg.sh | 5 +++ .../create_nginx_image/01create-image.sh | 3 ++ .../creating_data/create_nginx_image/Dockerfile | 10 +++++ bash/tools/creating_data/download-bin-tools.sh | 12 +++++- bash/tools/creating_data/download-docker-images.sh | 11 +++++- bash/tools/creating_data/download-git-repos.sh | 7 +++- bash/tools/creating_data/download-http-files.sh | 8 +++- bash/tools/creating_data/download-npm-pkgs.sh | 7 +++- bash/tools/creating_data/download-oom.sh | 4 ++ bash/tools/creating_data/download-pip.sh | 7 ++++ bash/tools/creating_data/download-pkg.sh | 4 ++ bash/tools/creating_data/load-docker-images.sh | 11 ++++++ .../tools/creating_data/make-docker-images-list.sh | 3 ++ bash/tools/creating_data/make-git-http-list.sh | 19 +++++++++ bash/tools/creating_data/make-npm-list.sh | 8 ++++ bash/tools/creating_data/remote-list-gathering.sh | 11 ++++++ bash/tools/creating_data/save-docker-images.sh | 11 ++++++ bash/tools/creating_data/upload-maven-files.sh | 5 +++ bash/tools/data_list/docker_image_list.txt | 2 +- bash/tools/data_list/git_manual_list | 4 +- bash/tools/data_list/git_repos_list | 8 ++-- bash/tools/data_list/http_manual_list.txt | 2 +- bash/tools/data_list/npm_list.txt | 2 +- bash/tools/deploy_nexus.sh | 45 ++++++++++++++++++++++ 24 files changed, 196 insertions(+), 13 deletions(-) (limited to 'bash') diff --git a/bash/tools/create_si_cacert_pkg.sh b/bash/tools/create_si_cacert_pkg.sh index eac728be..197f0c0f 100644 --- a/bash/tools/create_si_cacert_pkg.sh +++ b/bash/tools/create_si_cacert_pkg.sh @@ -1,4 +1,5 @@ #! /bin/bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,9 +17,13 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + self="$0" tools_dir=$(dirname "$self") + TARGET_FILE="./install_cacert.sh" + cat "$tools_dir/certificates/self_extract_cacert.sh" "$tools_dir/../../live/certs/rootCAcert.crt" > $TARGET_FILE chmod a+x $TARGET_FILE echo "Created self installation file: $TARGET_FILE" diff --git a/bash/tools/creating_data/create_nginx_image/01create-image.sh b/bash/tools/creating_data/create_nginx_image/01create-image.sh index 5469d3e7..86d96cf2 100644 --- a/bash/tools/creating_data/create_nginx_image/01create-image.sh +++ b/bash/tools/creating_data/create_nginx_image/01create-image.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + script_dir="$(dirname ${BASH_SOURCE[0]})" cd "$script_dir" docker build -t own_nginx . diff --git a/bash/tools/creating_data/create_nginx_image/Dockerfile b/bash/tools/creating_data/create_nginx_image/Dockerfile index aafa264c..412d4edb 100644 --- a/bash/tools/creating_data/create_nginx_image/Dockerfile +++ b/bash/tools/creating_data/create_nginx_image/Dockerfile @@ -15,8 +15,18 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + FROM nginx:alpine + RUN apk add --no-cache --update fcgiwrap git git-daemon spawn-fcgi + +#RUN mkdir /srv/http +#VOLUME ["/var/log/nginx"] + COPY gitconfig /etc/ +#COPY nginx.conf /etc/nginx/nginx.conf + CMD spawn-fcgi -M 666 -s /var/run/fcgiwrap.socket /usr/bin/fcgiwrap && \ nginx -g "daemon off;" + +#CMD ["spawn-fcgi","-M 666","-s /var/run/fcgiwrap.socket","/usr/sbin/fcgiwrap"] diff --git a/bash/tools/creating_data/download-bin-tools.sh b/bash/tools/creating_data/download-bin-tools.sh index 31f4beb8..b48cd2df 100644 --- a/bash/tools/creating_data/download-bin-tools.sh +++ b/bash/tools/creating_data/download-bin-tools.sh @@ -15,13 +15,17 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + outdir="$1" if [[ -z "$outdir" ]]; then echo "Missing arg outdir" exit 1 fi + + mkdir -p "$outdir" cd "$outdir" + download() { url="$1" url_file="${url%%\?*}" @@ -29,13 +33,19 @@ download() { echo "Downloading $url" curl --retry 5 -y 10 -Y 10 --location "$url" -o "$file" } + download "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" mv ./jq-linux64 ./jq + download "https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl" + download "https://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz" tar -xf ./helm-v2.8.2-linux-amd64.tar.gz linux-amd64/helm -O > helm rm ./helm-v2.8.2-linux-amd64.tar.gz + download "https://github.com/rancher/cli/releases/download/v0.6.7/rancher-linux-amd64-v0.6.7.tar.gz" tar -xf ./rancher-linux-amd64-v0.6.7.tar.gz ./rancher-v0.6.7/rancher -O > rancher rm ./rancher-linux-amd64-v0.6.7.tar.gz -chmod a+x ./helm ./jq ./kubectl ./rancher \ No newline at end of file + + +chmod a+x ./helm ./jq ./kubectl ./rancher diff --git a/bash/tools/creating_data/download-docker-images.sh b/bash/tools/creating_data/download-docker-images.sh index d0115547..121cd5af 100644 --- a/bash/tools/creating_data/download-docker-images.sh +++ b/bash/tools/creating_data/download-docker-images.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + # boilerplate RELATIVE_PATH=../ # relative path from this script to 'common-functions.sh' if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then @@ -23,17 +26,22 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh fi + SRC_IMAGE_LIST=$1 if [[ -z "$SRC_IMAGE_LIST" ]]; then SRC_IMAGE_LIST="docker_image_list.txt" fi + echo "Download all images" + lines=$(cat $SRC_IMAGE_LIST | wc -l) line=1 while read -r image; do echo "== pkg #$line of $lines ==" + name=$(echo $image|awk '{print $1}') digest=$(echo $image|awk '{print $2}') + echo "$name digest:$digest" if [[ "$digest" == "" ]]; then retry docker -l error pull "$name" @@ -41,4 +49,5 @@ while read -r image; do retry docker -l error pull "$name" fi line=$((line+1)) -done < "$SRC_IMAGE_LIST" \ No newline at end of file + +done < "$SRC_IMAGE_LIST" diff --git a/bash/tools/creating_data/download-git-repos.sh b/bash/tools/creating_data/download-git-repos.sh index 4cd936d0..9d651d93 100644 --- a/bash/tools/creating_data/download-git-repos.sh +++ b/bash/tools/creating_data/download-git-repos.sh @@ -15,17 +15,22 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + lists_dir="$1" + if [[ -z "$lists_dir" ]]; then echo "Missing argument for lists_dir" exit 1 fi + outdir="$2" if [[ -z "$outdir" ]]; then outdir="./git-repo" fi + mkdir -p "$outdir" cd "$outdir" # NOTE: will be better to use sh extension? sh $lists_dir/git_manual_list -sh $lists_dir/git_repos_list \ No newline at end of file +sh $lists_dir/git_repos_list + diff --git a/bash/tools/creating_data/download-http-files.sh b/bash/tools/creating_data/download-http-files.sh index 267d7952..06f41354 100644 --- a/bash/tools/creating_data/download-http-files.sh +++ b/bash/tools/creating_data/download-http-files.sh @@ -15,20 +15,25 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + LIST_FILE="$1" if [[ -z "$LIST_FILE" ]]; then echo "Missing list file" exit 1 fi + outdir="$2" if [[ -z "$outdir" ]]; then echo "Missing output directory" exit 1 fi + lines=$(cat "$LIST_FILE" | wc -l) cnt=1 + # create output dir if not exists mkdir -p "$outdir" + while read -r line; do # www.springframework.org/schema/tool/spring-tool-4.3.xsd file="${line%%\?*}" @@ -39,4 +44,5 @@ while read -r line; do # drop below 10b/10s curl --retry 5 -y 10 -Y 10 --location "$line" -o "$outdir/$file" &>/dev/null cnt=$((cnt+1)) -done < "$LIST_FILE" \ No newline at end of file + +done < "$LIST_FILE" diff --git a/bash/tools/creating_data/download-npm-pkgs.sh b/bash/tools/creating_data/download-npm-pkgs.sh index 00737f2c..9e8847c9 100644 --- a/bash/tools/creating_data/download-npm-pkgs.sh +++ b/bash/tools/creating_data/download-npm-pkgs.sh @@ -15,15 +15,19 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + LIST_FILE="$1" + if [[ -z "$LIST_FILE" ]]; then LIST_FILE="all_npm_list.txt" fi + outdir="$2" if [[ -z "$outdir" ]]; then echo "Missing arg outdir" exit 1 fi + mkdir -p "$outdir" cd "$outdir" lines=$(cat "$LIST_FILE" | wc -l) @@ -33,4 +37,5 @@ while read -r line; do # yallist@2.1.2 npm pack $line cnt=$((cnt+1)) -done < "$LIST_FILE" \ No newline at end of file + +done < "$LIST_FILE" diff --git a/bash/tools/creating_data/download-oom.sh b/bash/tools/creating_data/download-oom.sh index f0b4152f..010eeec1 100644 --- a/bash/tools/creating_data/download-oom.sh +++ b/bash/tools/creating_data/download-oom.sh @@ -15,6 +15,7 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + outdir="$1" if [[ -z "$outdir" ]]; then echo "Missing output dir" @@ -25,9 +26,12 @@ if [[ -z "$patch_file" ]]; then echo "Missing patch file" exit 1 fi + cd "$outdir" git clone https://github.com/onap/oom.git cd oom echo "Checkout base commit which will be patched" git checkout -b patched_beijing bf47d706fc8b94fd1232960e90329a9a532c6a7b + patch -p1 < "$patch_file" + diff --git a/bash/tools/creating_data/download-pip.sh b/bash/tools/creating_data/download-pip.sh index 1121ffd5..dea60b52 100644 --- a/bash/tools/creating_data/download-pip.sh +++ b/bash/tools/creating_data/download-pip.sh @@ -15,24 +15,31 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + LIST_FILE="$1" if [[ -z "$LIST_FILE" ]]; then echo "Missing list file" exit 1 fi LIST_FILE=$(readlink -f "$LIST_FILE") + + outdir="$2" if [[ -z "$outdir" ]]; then echo "Missing output directory" exit 1 fi + lines=$(cat "$LIST_FILE" | wc -l) cnt=1 + # create output dir if not exists mkdir -p "$outdir" + cd "$outdir" while read -r line; do echo "Downloading $cnt / $lines: $line" pip download $line cnt=$((cnt+1)) + done < "$LIST_FILE" diff --git a/bash/tools/creating_data/download-pkg.sh b/bash/tools/creating_data/download-pkg.sh index 2a5290ca..03bfe07f 100644 --- a/bash/tools/creating_data/download-pkg.sh +++ b/bash/tools/creating_data/download-pkg.sh @@ -15,11 +15,13 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + outdir="$1" if [[ -z "$outdir" ]]; then echo "Missing output dir" exit 1 fi + # if onap.repo does not exists create it mkdir -p $outdir if [ ! -f "$outdir/onap.repo" ]; then @@ -31,8 +33,10 @@ enabled=1 gpgcheck=0 EOF fi + # this exact docker version is required by ONAP/beijing # it should be available in centos docker repo yumdownloader --resolve --destdir="$outdir" docker-ce-17.03.2.ce libtool-ltdl docker-ce-selinux + yumdownloader --resolve --destdir="$outdir" dnsmasq icewm firefox tigervnc-server perl* createrepo "$outdir" diff --git a/bash/tools/creating_data/load-docker-images.sh b/bash/tools/creating_data/load-docker-images.sh index e97fc6b9..685bed42 100644 --- a/bash/tools/creating_data/load-docker-images.sh +++ b/bash/tools/creating_data/load-docker-images.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + # boilerplate RELATIVE_PATH=../ # relative path from this script to 'common-functions.sh' if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then @@ -23,21 +26,26 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh fi + CLEAN=false + if [ -z "$NEXUS_HOST" ]; then echo "Independent run for inserting of additional docker images" CLEAN=true mv ~/.docker/config.json ~/.docker/config.json_backup 2>/dev/null source "$LOCAL_PATH/docker-login.sh" fi + IMG_DIR="$1" if [[ -z "$IMG_DIR" ]]; then IMG_DIR="$(pwd)/images" fi + if [[ ! -d "${IMG_DIR}" ]]; then echo "No ${IMG_DIR} to load images" exit 0 fi + load_image() { local image="$1" echo "[DEBUG] load ${image}" @@ -49,14 +57,17 @@ load_image() { # delete pushed image from docker retry docker rmi "$name" } + IMAGES=$(find ${IMG_DIR} -name "*.tar" -type f) lines=$(echo ${IMAGES} | wc -l) line=1 for image in ${IMAGES}; do echo "== pkg #$line of $lines ==" load_image "$image" + line=$((line+1)) done + if [ "$CLEAN" = true ]; then # onap is using different credentials for docker login which can be conflicted # with ours so better to clean this-up diff --git a/bash/tools/creating_data/make-docker-images-list.sh b/bash/tools/creating_data/make-docker-images-list.sh index 61b236f4..b925d91d 100644 --- a/bash/tools/creating_data/make-docker-images-list.sh +++ b/bash/tools/creating_data/make-docker-images-list.sh @@ -15,6 +15,9 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + readonly IMG_LIST="/tmp/docker_image_list.txt" + echo "gathering images" docker images --digests | grep -v 'IMAGE ID'|awk '{printf("%s:%s %s\n", $1, $2, $3)}' > $IMG_LIST + diff --git a/bash/tools/creating_data/make-git-http-list.sh b/bash/tools/creating_data/make-git-http-list.sh index 1e97d337..a724d6f0 100644 --- a/bash/tools/creating_data/make-git-http-list.sh +++ b/bash/tools/creating_data/make-git-http-list.sh @@ -1,3 +1,5 @@ +# COPYRIGHT NOTICE STARTS HERE +# # Copyright 2018 © Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,27 +15,38 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + if [[ -z "$LISTS_DIR" ]]; then LISTS_DIR=. echo "Using default output directory ." fi + OOM_PATH="$1" + if [[ -z "$OOM_PATH" ]]; then echo "Missing oom path" exit 1 fi + + GOUTPUT="$LISTS_DIR/git_repos_list" FOUTPUT="$LISTS_DIR/fetch_list.txt" + trim_last() { echo "${@:1:$#-1}"; } + TMP='/tmp/git_tmp_list' :> $TMP + :> $FOUTPUT + echo "Gathering git repos and list possible html data" + while read -r chart; do out="$(helm template $(dirname "$chart") 2>/dev/null)" gitcmds=$(echo "$out" | grep 'git clone') + if [[ -n "$gitcmds" ]] ; then while read gitcmd; do gitcmd=$(trim_last $gitcmd) @@ -43,6 +56,7 @@ while read -r chart; do echo "$full" >> $TMP done <<< "$gitcmds" fi + fetchcmds=$(echo "$out" | grep 'wget \|curl ' | grep -v 'HEALTH_CHECK_ENDPOINT\|PUT\|POST' ) if [[ -n "$fetchcmds" ]] ; then while read fetchcmd; do @@ -51,5 +65,10 @@ while read -r chart; do echo "$fetchcmd" >> $FOUTPUT done <<< "$fetchcmds" fi + + done <<< "$(find $OOM_PATH -name Chart.yaml)" + sort $TMP | uniq > $GOUTPUT + + diff --git a/bash/tools/creating_data/make-npm-list.sh b/bash/tools/creating_data/make-npm-list.sh index dd3be670..5901d54d 100644 --- a/bash/tools/creating_data/make-npm-list.sh +++ b/bash/tools/creating_data/make-npm-list.sh @@ -1,3 +1,5 @@ +# COPYRIGHT NOTICE STARTS HERE +# # Copyright 2018 © Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,9 +15,13 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + FIND_PATH="/var/lib/docker/aufs/mnt/" + LIST_FILE="/tmp/npm.list" + : > $LIST_FILE + echo "gathering npm packages from $FIND_PATH" while read -r line; do # yallist/2.1.2/package/package.json @@ -24,4 +30,6 @@ while read -r line; do # tag=$(echo $image|awk '{print $2}') # save_image "$name:$tag" echo "$name@$ver" >> $LIST_FILE + done <<< "$(find $FIND_PATH -path "*/.npm/*/package.json" | sed 's#^.*\.npm/\(.*\)$#\1#' | sort | uniq)" + diff --git a/bash/tools/creating_data/remote-list-gathering.sh b/bash/tools/creating_data/remote-list-gathering.sh index 245e1eec..73fb164a 100644 --- a/bash/tools/creating_data/remote-list-gathering.sh +++ b/bash/tools/creating_data/remote-list-gathering.sh @@ -1,3 +1,5 @@ +# COPYRIGHT NOTICE STARTS HERE +# # Copyright 2018 © Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +15,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + if [[ -z "$ONAP_SERVERS" ]]; then # ONAP_SERVERS="oom-beijing-postRC2-master oom-beijing-postRC2-compute1 oom-beijing-postRC2-compute2" echo "Missing environment ONAP_SERVERS" @@ -22,15 +26,20 @@ if [[ -z "$LISTS_DIR" ]]; then LISTS_DIR=. echo "Using default output directory ." fi + echo "Using onap servers: $ONAP_SERVERS" + cd $(dirname $0) + for server in $ONAP_SERVERS; do + echo "=================================================" echo "Gathering docker images list from server: $server" echo "=================================================" scp ./make-docker-images-list.sh $server:/tmp/ ssh $server '/tmp/make-docker-images-list.sh;rm /tmp/make-docker-images-list.sh' scp $server:/tmp/docker_image_list.txt $LISTS_DIR/docker_image_list-${server}.txt + echo "=================================================" echo "Gathering NPM packages list from server: $server" echo "=================================================" @@ -38,5 +47,7 @@ for server in $ONAP_SERVERS; do ssh $server '/tmp/make-npm-list.sh; rm /tmp/make-npm-list.sh' scp $server:/tmp/npm.list $LISTS_DIR/npm_list-${server}.txt done + cat "$LISTS_DIR"/docker_image_list-*.txt | grep -v sonatype/nexus3 | grep -v own_nginx | sort | uniq > "$LISTS_DIR/docker_image_list.txt" cat "$LISTS_DIR"/npm_list-*.txt | grep -v '^@$' | sort | uniq > "$LISTS_DIR/npm_list.txt" + diff --git a/bash/tools/creating_data/save-docker-images.sh b/bash/tools/creating_data/save-docker-images.sh index 98facb0c..f4a5d3c7 100644 --- a/bash/tools/creating_data/save-docker-images.sh +++ b/bash/tools/creating_data/save-docker-images.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + # boilerplate RELATIVE_PATH=../ # relative path from this script to 'common-functions.sh' if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then @@ -23,19 +26,24 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh fi + IMG_DIR="$1" + if [[ -z "$IMG_DIR" ]]; then IMG_DIR="./images" fi + echo "Creating ${IMG_DIR}" if [[ ! -d "${IMG_DIR}" ]]; then mkdir -p "${IMG_DIR}" fi + save_image() { local name_tag=$1 echo "$name_tag" local img_name=$(echo "${name_tag}" | tr /: __) local img_path="${IMG_DIR}/${img_name}.tar" + if [[ ! -f "${img_path}" ]] ; then echo "[DEBUG] save ${name_tag} to ${img_path}" echo "${name_tag}" >> $IMG_DIR/_image_list.txt @@ -44,13 +52,16 @@ save_image() { echo "[DEBUG] ${name_tag} already saved" fi } + echo "Save all images" line=1 lines=$(docker images|grep -v 'IMAGE ID'|wc -l) while read -r image; do echo "== pkg #$line of $lines ==" + name=$(echo $image|awk '{print $1}') tag=$(echo $image|awk '{print $2}') save_image "$name:$tag" line=$((line+1)) + done <<< "$(docker images|grep -v 'IMAGE ID'|awk '{printf("%s %s\n", $1, $2)}'|column -t)" diff --git a/bash/tools/creating_data/upload-maven-files.sh b/bash/tools/creating_data/upload-maven-files.sh index bd071fbc..07d6e7ab 100644 --- a/bash/tools/creating_data/upload-maven-files.sh +++ b/bash/tools/creating_data/upload-maven-files.sh @@ -15,6 +15,7 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + DATA_DIR="$1" if [[ -z "$DATA_DIR" ]]; then # needs for example: /root/onap-offline-installer/http @@ -22,10 +23,13 @@ if [[ -z "$DATA_DIR" ]]; then echo "Usage: $0 [...]" exit 1 fi + shift cd "$DATA_DIR" + for server in $*; do echo "Uploading to server: $server" + lines=$(find $server/ -type f | wc -l) count=1 while read -r url; do @@ -34,5 +38,6 @@ for server in $*; do path="$url" echo "Uploading file: $url" curl -u admin:admin123 --upload-file $path http://$url + done <<< "$(find $server/ -type f)" done diff --git a/bash/tools/data_list/docker_image_list.txt b/bash/tools/data_list/docker_image_list.txt index f8a4d27a..2a039bc1 100644 --- a/bash/tools/data_list/docker_image_list.txt +++ b/bash/tools/data_list/docker_image_list.txt @@ -160,4 +160,4 @@ registry.hub.docker.com/library/mysql:5.7 sha256:49f6cb7658627d9e8cd3ef2952579e2 registry.hub.docker.com/oomk8s/ubuntu-init:2.0.0 sha256:bde840645eb1ae3d4397939ae916963bec0193e3be641f4579595fd24745868e taskrabbit/elasticsearch-dump:latest sha256:93f16d8ef89ab05d928700432b0273138fabf365bb4a1e46ba0a493598a66d9f wurstmeister/kafka:1.1.0 sha256:5778f4c22f2f3facc273afcf0599d3d6c6f6daa546039f669c275d9d0aa6a261 -wurstmeister/zookeeper:latest sha256:1c11ca7e20385bf42e3aa58e7d1eb81a273a3ec650847ede225631e7d80e03e3 \ No newline at end of file +wurstmeister/zookeeper:latest sha256:1c11ca7e20385bf42e3aa58e7d1eb81a273a3ec650847ede225631e7d80e03e3 diff --git a/bash/tools/data_list/git_manual_list b/bash/tools/data_list/git_manual_list index bbc08d2b..43273678 100644 --- a/bash/tools/data_list/git_manual_list +++ b/bash/tools/data_list/git_manual_list @@ -1,4 +1,6 @@ git clone https://github.com/rancher/community-catalog.git --bare github.com/rancher/community-catalog.git git clone https://git.rancher.io/rancher-catalog.git --bare git.rancher.io/rancher-catalog.git +# oom/kubernetes/robot/resources/config/eteshare/config/vm_properties.py git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/testsuite/properties.git --bare gerrit.onap.org/r/testsuite/properties.git -git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/portal.git --bare gerrit.onap.org/r/portal.git \ No newline at end of file +# oom/kubernetes/portal/docker/init/mariadb-client/Dockerfile +git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/portal.git --bare gerrit.onap.org/r/portal.git diff --git a/bash/tools/data_list/git_repos_list b/bash/tools/data_list/git_repos_list index bbc08d2b..fbfeaaf5 100644 --- a/bash/tools/data_list/git_repos_list +++ b/bash/tools/data_list/git_repos_list @@ -1,4 +1,4 @@ -git clone https://github.com/rancher/community-catalog.git --bare github.com/rancher/community-catalog.git -git clone https://git.rancher.io/rancher-catalog.git --bare git.rancher.io/rancher-catalog.git -git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/testsuite/properties.git --bare gerrit.onap.org/r/testsuite/properties.git -git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/portal.git --bare gerrit.onap.org/r/portal.git \ No newline at end of file +git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/aaf/authz.git --bare gerrit.onap.org/r/aaf/authz.git +git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/demo.git --bare gerrit.onap.org/r/demo.git +git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git --bare gerrit.onap.org/r/dmaap/messagerouter/messageservice.git +git clone -b 2.0.0-ONAP --single-branch http://gerrit.onap.org/r/so/docker-config.git --bare gerrit.onap.org/r/so/docker-config.git diff --git a/bash/tools/data_list/http_manual_list.txt b/bash/tools/data_list/http_manual_list.txt index c99751de..c7486b7f 100644 --- a/bash/tools/data_list/http_manual_list.txt +++ b/bash/tools/data_list/http_manual_list.txt @@ -1482,4 +1482,4 @@ repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom.asc repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar.asc.sha1 www.getcloudify.org/spec/cloudify/3.4/types.yaml -github.com/packethost/docker-machine-driver-packet/releases/download/v0.1.2/docker-machine-driver-packet_linux-amd64.zip \ No newline at end of file +github.com/packethost/docker-machine-driver-packet/releases/download/v0.1.2/docker-machine-driver-packet_linux-amd64.zip diff --git a/bash/tools/data_list/npm_list.txt b/bash/tools/data_list/npm_list.txt index 328c47d6..84528569 100644 --- a/bash/tools/data_list/npm_list.txt +++ b/bash/tools/data_list/npm_list.txt @@ -713,4 +713,4 @@ yallist@2.1.2 yamljs@0.3.0 yargs@3.10.0 yauzl@2.4.1 -zeparser@0.0.5 \ No newline at end of file +zeparser@0.0.5 diff --git a/bash/tools/deploy_nexus.sh b/bash/tools/deploy_nexus.sh index ab1c80b2..1532c614 100644 --- a/bash/tools/deploy_nexus.sh +++ b/bash/tools/deploy_nexus.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,11 +17,15 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + # fail fast set -e + # OS check . /etc/os-release OS_ID="${ID}" + case "$OS_ID" in centos) ;; @@ -33,6 +38,7 @@ case "$OS_ID" in exit 1 ;; esac + # boilerplate RELATIVE_PATH=./ # relative path from this script to 'common-functions.sh' if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then @@ -40,35 +46,45 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh fi + # # local functions # + start_nexus() { echo "** Starting nexus **" if [[ -z "$NEXUS_DATA" ]]; then echo "Nexus data env is not set" exit -3 fi + # valid for case of fresh nexus deployment # data are inserted in later phases mkdir -p $NEXUS_DATA # hardening chmod a+wrX $NEXUS_DATA chown -R 200:200 $NEXUS_DATA + docker rm -f nexus 1> /dev/null 2>&1 || true + docker run -d --name nexus\ --restart unless-stopped \ -v $NEXUS_DATA:/nexus-data:rw \ sonatype/nexus3 + echo "** Creating docker network **" docker network create nexus_network docker network connect nexus_network nexus } + start_nginx() { echo "** Starting reverse proxy - nginx **" + docker rm -f nginx 1> /dev/null 2>&1 || true mkdir -p $NGINX_HTTP_DIR/repo.install-server + mkdir -p "$NGINX_HTTP_DIR/repo.install-server" + docker run -d -p 80:80 -p 443:443 -p 10001:443 \ --name nginx \ --network nexus_network \ @@ -81,29 +97,41 @@ start_nginx() { --restart unless-stopped \ own_nginx } + patch_cert() { file=$1 cp "$APROJECT_DIR/cfg/$file" "$GEN_CFG_PATH/$file" +# sed "s#countryName =.*#countryName = $CERT_COUNTRY#" "$APROJECT_DIR/cfg/$file" > $GEN_CFG_PATH/$file +# sed "s#localityName =.*#localityName = $CERT_LOCALITY#" "$APROJECT_DIR/cfg/$file" > $GEN_CFG_PATH/$file +# sed "s#organizationName =.*#organizationName = $CERT_ORGANIZATION#" "$APROJECT_DIR/cfg/$file" > $GEN_CFG_PATH/$file } + patch_conf_files() { # patch nexus and root cert patch_cert nexus_cert.cnf patch_cert cacert.cnf + # patch nexus v3 ext cert sed "s#nexus.student12#$NEXUS_FQDN#" "$APROJECT_DIR/cfg/v3.ext" > $GEN_CFG_PATH/v3.ext + #patch nginx.conf sed "s#nexus.student12#$NEXUS_FQDN#" "$APROJECT_DIR/cfg/nginx.conf" > $GEN_CFG_PATH/nginx.conf } + # # body # + message info "Nexus will be installed into this directory: $(pwd)" + if ! [ -f ./local_repo.conf ]; then printf "[?] > Do you want continue? (if no, hit CTRL+C): " read x fi + message info "Reading configuration" get_configuration + mkdir -p "$CERTS_TARGET_PATH" mkdir -p "$NGINX_LOG_DIR" mkdir -p "$GEN_CFG_PATH" @@ -113,37 +141,54 @@ if [ "$IS_SELF_EXTRACT" = YES ] ; then sleep 3s may_self_extract fi + # echo "Cleanup docker (if installed)" docker rm -f nginx 1> /dev/null 2>&1 || true docker rm -f nexus 1> /dev/null 2>&1 || true + install_files install_packages "$OS_ID" setup_vnc_server + update_hosts + # TODO #check_dependencies + echo "Restarting dnsmasq" +# TODO dnsmasq config? systemctl enable dnsmasq systemctl restart dnsmasq + echo "** Generating config files to $GEN_CFG_PATH **" echo "Configure ssl certificates" + patch_conf_files create_root_CA + # create selfinstall CA cert $BASH_SCRIPTS_DIR/tools/create_si_cacert_pkg.sh # run generated file ./install_cacert.sh + create_cert "nexus" + echo "** Certificates finished **" + update_docker_cfg + echo "Restarting docker" systemctl enable docker systemctl restart docker + update_firewall + set +e + echo "** Loading images **" docker load -i $RESOURCES_DIR/offline_data/docker_images_infra/sonatype_nexus3_latest.tar docker load -i $RESOURCES_DIR/offline_data/docker_images_infra/own_nginx_latest.tar + start_nexus start_nginx -- cgit 1.2.3-korg