From ec5d95953b614de3124bd733dfc739da1383130e Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 28 Feb 2020 13:49:01 -0700 Subject: Remove Docker related items --- bin/docker-build | 15 --------------- bin/docker-dotenv | 33 --------------------------------- bin/docker-shell | 9 --------- bin/test | 18 ------------------ bin/test-all | 30 ------------------------------ bin/test-local | 9 +-------- bin/update-spdx | 3 --- 7 files changed, 1 insertion(+), 116 deletions(-) delete mode 100755 bin/docker-build delete mode 100755 bin/docker-dotenv delete mode 100755 bin/docker-shell delete mode 100755 bin/test delete mode 100755 bin/test-all delete mode 100755 bin/update-spdx (limited to 'bin') diff --git a/bin/docker-build b/bin/docker-build deleted file mode 100755 index 1751c74..0000000 --- a/bin/docker-build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")/.." - -if command -v docker; then - IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} - - docker build . -t "$IMAGE_NAME" --pull -else - echo "Install docker: https://docs.docker.com/engine/installation/" - exit 1 -fi - diff --git a/bin/docker-dotenv b/bin/docker-dotenv deleted file mode 100755 index ca025c0..0000000 --- a/bin/docker-dotenv +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# input: -# SOURCE_IMAGE: Image name for the source image -# TARGET_IMAGE: Name of image to build -# DOTENV: The name of the .env.* file that contains the default env vars to export. -# e.g. DOTENV=".env.12-3-stable" - -set -e - -cd "$(dirname "$0")/.." -DOCKERFILE=Dockerfile.env - -rm -f $DOCKERFILE -touch $DOCKERFILE -echo "FROM $SOURCE_IMAGE" > $DOCKERFILE - -echo "Reading... $DOTENV" -cat $DOTENV - -while IFS= read -r line; do - echo "ENV $line" >> $DOCKERFILE -done < $DOTENV - -echo "Pulling... $SOURCE_IMAGE" -docker pull $SOURCE_IMAGE - -echo "Building... $DOCKERFILE and tagging $TARGET_IMAGE" -cat $DOCKERFILE -docker build -t $TARGET_IMAGE -f $DOCKERFILE . - -echo "Verifying env..." -docker run --entrypoint='' $TARGET_IMAGE env diff --git a/bin/docker-shell b/bin/docker-shell deleted file mode 100755 index be0db98..0000000 --- a/bin/docker-shell +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")/.." - -IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} - -docker run --rm -it --entrypoint='' $1 "$IMAGE_NAME" /bin/bash -l diff --git a/bin/test b/bin/test deleted file mode 100755 index 8c08e55..0000000 --- a/bin/test +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")/.." - -export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-2} -export LM_REPORT_VERSION=${LM_REPORT_VERSION:-1} -export QA_RESULTS=${QA_RESULTS:-$QA_PROJECT-v$LM_REPORT_VERSION} -export RESULTS_DIR=${RESULTS_DIR:-$(pwd)/results} -export QA_REF=${QA_REF:-master} - -docker run \ - --rm \ - --env LM_PYTHON_VERSION \ - --env LM_REPORT_VERSION \ - --volume "$RESULTS_DIR":/results \ - "$IMAGE_NAME" test "$QA_PROJECT" "$QA_RESULTS" "$QA_REF" diff --git a/bin/test-all b/bin/test-all deleted file mode 100755 index 643eef5..0000000 --- a/bin/test-all +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")/.." - -RESULTS_DIR=$(pwd)/tmp -export RESULTS_DIR -IMAGE_NAME=$(basename "$PWD"):latest -export IMAGE_NAME - -./bin/docker-build - -REPORT_VERSIONS=(2 1.1 1) -for version in "${REPORT_VERSIONS[@]}" -do - export LM_REPORT_VERSION=$version - echo "Report Version $LM_REPORT_VERSION" - QA_PROJECT=go-modules ./bin/test - QA_PROJECT=php-composer ./bin/test - QA_PROJECT=java-maven QA_REF=831c7a04 ./bin/test - QA_PROJECT=python-pip QA_REF=04dce91b LM_PYTHON_VERSION=2 ./bin/test - QA_PROJECT=python-pip QA_RESULTS="python3-pip-v$version" QA_REF=48e250a1 LM_PYTHON_VERSION=3 ./bin/test - QA_PROJECT=ruby-bundler ./bin/test - QA_PROJECT=js-yarn ./bin/test - QA_PROJECT=js-npm ./bin/test - QA_PROJECT=csharp-nuget-dotnetcore ./bin/test - QA_PROJECT=python-pipenv QA_REF=pip-file-lock ./bin/test - QA_PROJECT=java-gradle ./bin/test -done diff --git a/bin/test-local b/bin/test-local index 4111eb5..e7e7325 100755 --- a/bin/test-local +++ b/bin/test-local @@ -5,11 +5,4 @@ set -e cd "$(dirname "$0")/.." PROJECT_PATH="$1" - -if [ -z "$LM_HOME" ]; then - export IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} - - docker run --rm --env LICENSE_FINDER_CLI_OPTS --volume "$PROJECT_PATH":/code "$IMAGE_NAME" analyze /code -else - bash -l ./run.sh analyze "$PROJECT_PATH" -fi +bash -l ./run.sh analyze "$PROJECT_PATH" diff --git a/bin/update-spdx b/bin/update-spdx deleted file mode 100755 index c3c679c..0000000 --- a/bin/update-spdx +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -wget https://spdx.org/licenses/licenses.json -q -O spdx-licenses.json -- cgit v1.2.3