From d1ef03b7f6e8b5b9b614e6185515d60f925352eb Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Sat, 29 Jul 2017 13:09:39 +1000 Subject: [PATCH] Add default user to Makefile run and mount /srv externally --- .gitignore | 3 +++ Makefile | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e0a126e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.swp +srv/ +env diff --git a/Makefile b/Makefile index 0d143e8..6754fcd 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,12 @@ build: bash: docker run --rm -it $(docker_tag) bash -run: - $(eval ID := $(shell docker run -d ${docker_tag})) +env: + @echo "FTP_USER=ftp" >> env + @echo "FTP_PASSWORD=ftp" >> env + +run: env + $(eval ID := $(shell docker run -d --env-file env -v $(shell pwd)/srv:/srv ${docker_tag})) $(eval IP := $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${ID})) @echo "Running ${ID} @ ftp://${IP}" @docker attach ${ID}