mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 10:10:12 +00:00
Code Issues Releases Wiki Activity

Update docker run statements

Browse Source 
- Update Makefiles to _optionally_ include TTY
This commit is contained in:
Emerle, Ryan 2021-11-01 12:36:21 -04:00
parent c4d10a201e
commit 45e7ce6a6a
No known key found for this signature in database
GPG Key ID: C0D34C592AED41CE
10 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/assemble_api_jar.sh
View File

@ -45,4 +45,4 @@ if [[ $UPDATE_DOCKER -eq 1 ]]; then
fi fi
echo "Building VinylDNS API jar file" echo "Building VinylDNS API jar file"
docker run -it --rm -e RUN_SERVICES=none -v "${DIR}/..:/build" vinyldns/build:base-test-integration -- sbt 'api/assembly' docker run -i --rm -e RUN_SERVICES=none -v "${DIR}/..:/build" vinyldns/build:base-test-integration -- sbt 'api/assembly'

3
build/docker/api/Makefile
View File

@ -40,7 +40,8 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -it --rm --env-file "$(ROOT_DIR)/../.env" --network vinyldns_net $(DOCKER_PARAMS) -v "$$(pwd)/:/opt/vinyldns/conf/" -p 9000:9000 $(IMAGE_NAME):$(IMAGE_TAG) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm --env-file "$(ROOT_DIR)/../.env" --network vinyldns_net $(DOCKER_PARAMS) -v "$$(pwd)/:/opt/vinyldns/conf/" -p 9000:9000 $(IMAGE_NAME):$(IMAGE_TAG) $(ARG_SEPARATOR) $(WITH_ARGS)
publish: build publish: build
@set -euo pipefail @set -euo pipefail

3
build/docker/portal/Makefile
View File

@ -44,7 +44,8 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -it --rm --network vinyldns_net --env-file "$(ROOT_DIR)/../.env" $(DOCKER_PARAMS) -v "$$(pwd)/application.conf:/opt/vinyldns/conf/application.conf" -p 9001:9001 $(IMAGE_NAME):$(IMAGE_TAG) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm --network vinyldns_net --env-file "$(ROOT_DIR)/../.env" $(DOCKER_PARAMS) -v "$$(pwd)/application.conf:/opt/vinyldns/conf/application.conf" -p 9001:9001 $(IMAGE_NAME):$(IMAGE_TAG) $(ARG_SEPARATOR) $(WITH_ARGS)
publish: build publish: build
@set -euo pipefail @set -euo pipefail

2
build/publish_docs.sh
View File

@ -2,4 +2,4 @@
set -euo pipefail set -euo pipefail
DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P) DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
docker run -it --rm -e RUN_SERVICES=none -v "${DIR}/../:/build" vinyldns/build:base-build-docs /bin/bash -c "sbt ';project docs; publishMicrosite'" docker run -i --rm -e RUN_SERVICES=none -v "${DIR}/../:/build" vinyldns/build:base-build-docs /bin/bash -c "sbt ';project docs; publishMicrosite'"

3
modules/docs/Makefile
View File

@ -30,4 +30,5 @@ all: run
run: run:
@set -euo pipefail @set -euo pipefail
cd ../.. cd ../..
docker run -it --rm -p "4000:4000" -v "$$(pwd):/build" vinyldns/build:base-build-docs /bin/bash test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm -p "4000:4000" -v "$$(pwd):/build" vinyldns/build:base-build-docs /bin/bash

6
quickstart/api/Makefile
View File

@ -38,11 +38,13 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -it --rm $(DOCKER_PARAMS) --network vinyldns_net -v "$$(pwd)/application.conf:/opt/vinyldns/conf/vinyldns.conf" -v "$$(pwd)/logback.xml:/opt/vinyldns/conf/logback.xml" -p 9000:9000 $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) --network vinyldns_net -v "$$(pwd)/application.conf:/opt/vinyldns/conf/vinyldns.conf" -v "$$(pwd)/logback.xml:/opt/vinyldns/conf/logback.xml" -p 9000:9000 $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS)
run-bg: run-bg:
@set -euo pipefail @set -euo pipefail
docker stop $(IMAGE_NAME) &> /dev/null || true docker stop $(IMAGE_NAME) &> /dev/null || true
docker rm $(IMAGE_NAME) &> /dev/null || true docker rm $(IMAGE_NAME) &> /dev/null || true
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -td --name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) --network vinyldns_net -v "$$(pwd)/application.conf:/opt/vinyldns/conf/vinyldns.conf" -v "$$(pwd)/logback.xml:/opt/vinyldns/conf/logback.xml" -p 9001:9001 $(IMAGE_NAME) -- /bin/bash test -t 1 && USE_TTY="-t"
docker run -d $${USE_TTY}--name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) --network vinyldns_net -v "$$(pwd)/application.conf:/opt/vinyldns/conf/vinyldns.conf" -v "$$(pwd)/logback.xml:/opt/vinyldns/conf/logback.xml" -p 9001:9001 $(IMAGE_NAME) -- /bin/bash

6
quickstart/portal/Makefile
View File

@ -39,11 +39,13 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -it --rm $(DOCKER_PARAMS) --network vinyldns_net -p 9001:9001 $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) --network vinyldns_net -p 9001:9001 $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS)
run-bg: run-bg:
@set -euo pipefail @set -euo pipefail
docker stop $(IMAGE_NAME) &> /dev/null || true docker stop $(IMAGE_NAME) &> /dev/null || true
docker rm $(IMAGE_NAME) &> /dev/null || true docker rm $(IMAGE_NAME) &> /dev/null || true
docker network create --driver bridge vinyldns_net &> /dev/null || true docker network create --driver bridge vinyldns_net &> /dev/null || true
docker run -td --name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) --network vinyldns_net -p 9001:9001 $(IMAGE_NAME) -- /bin/bash test -t 1 && USE_TTY="-t"
docker run -d $${USE_TTY} --name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) --network vinyldns_net -p 9001:9001 $(IMAGE_NAME) -- /bin/bash

6
test/api/functional/Makefile
View File

@ -38,8 +38,10 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker run -it --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS)
run-local: run-local:
@set -euo pipefail @set -euo pipefail
docker run -it --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp -v "$(ROOT_DIR)/../../../modules/api/src/test/functional:/functional_test" $(IMAGE_NAME) -- $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp -v "$(ROOT_DIR)/../../../modules/api/src/test/functional:/functional_test" $(IMAGE_NAME) -- $(WITH_ARGS)

9
test/api/integration/Makefile
View File

@ -38,12 +38,14 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker run -it --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS)
run-bg: run-bg:
@set -euo pipefail @set -euo pipefail
docker stop $(IMAGE_NAME) &> /dev/null || true docker stop $(IMAGE_NAME) &> /dev/null || true
docker run -td --name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) -e RUN_SERVICES="deps-only tail-logs" -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME) test -t 1 && USE_TTY="-t"
docker run -d $${USE_TTY} --name $(IMAGE_NAME) --rm $(DOCKER_PARAMS) -e RUN_SERVICES="deps-only tail-logs" -p 19001-19003:19001-19003 -p 19001:19001/udp $(IMAGE_NAME)
stop-bg: stop-bg:
@set -euo pipefail @set -euo pipefail
@ -51,4 +53,5 @@ stop-bg:
run-local: run-local:
@set -euo pipefail @set -euo pipefail
docker run -it --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp -v "$(ROOT_DIR)/../../..:/build" $(IMAGE_NAME) -- $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(DOCKER_PARAMS) -p 9000:9000 -p 19001-19003:19001-19003 -p 19001:19001/udp -v "$(ROOT_DIR)/../../..:/build" $(IMAGE_NAME) -- $(WITH_ARGS)

6
test/portal/functional/Makefile
View File

@ -37,8 +37,10 @@ build:
run: run:
@set -euo pipefail @set -euo pipefail
docker run -it --rm $(IMAGE_NAME) -- $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm $(IMAGE_NAME) -- $(WITH_ARGS)
run-local: run-local:
@set -euo pipefail @set -euo pipefail
docker run -it --rm -v "$$(pwd)/../../../modules/portal:/functional_test" $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS) test -t 1 && USE_TTY="-t"
docker run -i $${USE_TTY} --rm -v "$$(pwd)/../../../modules/portal:/functional_test" $(IMAGE_NAME) $(ARG_SEPARATOR) $(WITH_ARGS)