From f45ce14334468caa377779c6ef7f9d444f224106 Mon Sep 17 00:00:00 2001 From: Rob Kiefer Date: Thu, 3 Jan 2019 14:11:19 -0500 Subject: [PATCH] Remove out-dated and unused scripts Nothing appears to use scripts/start-test-docker.sh, so it can be safely removed. docker-run.sh was still referenced on our docs page, but should soon be removed. It no longer actually provides anything useful (i.e., any memory settings it used to have have been removed) and is out-of-date with newer Docker setups. To remove the burden of keeping it up to date, we should just remove. --- scripts/docker-run.sh | 38 ------------------------------------ scripts/start-test-docker.sh | 33 ------------------------------- 2 files changed, 71 deletions(-) delete mode 100755 scripts/docker-run.sh delete mode 100755 scripts/start-test-docker.sh diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh deleted file mode 100755 index d763c4a1d..000000000 --- a/scripts/docker-run.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash -set -e - -if [[ -z "$IMAGE_NAME" ]]; then - echo "The IMAGE_NAME must be set" - exit 1 -fi - -DOCKER_HOST=${DOCKER_HOST:-localhost} -CONTAINER_NAME=${CONTAINER_NAME:-timescaledb} -DATA_DIR=${DATA_DIR-$PWD/data} -BIN_CMD=${BIN_CMD:-postgres} -PGPORT=${PGPORT:=5432} - -VOLUME_MOUNT="" -if [[ -n "$DATA_DIR" ]]; then - VOLUME_MOUNT="-v $DATA_DIR:/var/lib/postgresql/data" -fi -docker run -d \ - --name $CONTAINER_NAME $VOLUME_MOUNT \ - -p ${PGPORT}:5432 \ - -e PGDATA=/var/lib/postgresql/data/timescaledb \ - $IMAGE_NAME $BIN_CMD \ - -cshared_preload_libraries=timescaledb \ - -clog_line_prefix="%m [%p]: [%l-1] %u@%d" \ - -clog_error_verbosity=VERBOSE - -set +e -for i in {1..10}; do - sleep 2 - - pg_isready -h $DOCKER_HOST - - if [[ $? == 0 ]] ; then - exit 0 - fi - -done diff --git a/scripts/start-test-docker.sh b/scripts/start-test-docker.sh deleted file mode 100755 index c7561bd5f..000000000 --- a/scripts/start-test-docker.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [[ -z "$CONTAINER_NAME" ]]; then - echo "The CONTAINER_NAME must be set" - exit 1 -fi - -matchingStarted=`docker ps --filter="name=$CONTAINER_NAME" -q` -if [[ -n "${matchingStarted}" ]] -then - docker stop $matchingStarted -fi - -matching=`docker ps -a --filter="name=$CONTAINER_NAME" -q` -if [[ -n $matching ]]; then - docker rm $matching -fi - -CONTAINER_NAME=$CONTAINER_NAME \ -DATA_DIR="" \ -IMAGE_NAME=$IMAGE_NAME \ -PGPORT=${PGPORT:-5432} \ -$(dirname $0)/docker-run.sh - -TEST_TABLESPACE_PATH=${TEST_TABLESPACE_PATH:-/tmp/tspace1} - -# Create data directories for tablespaces tests -docker exec -i $CONTAINER_NAME /bin/bash << EOF -mkdir -p ${TEST_TABLESPACE_PATH} -chown postgres ${TEST_TABLESPACE_PATH} -EOF