diff options
| author |  Christopher Baklid <[email protected]> | 2018-04-30 16:05:37 +0200 |
|---|---|---|
| committer | Christopher Baklid <[email protected]> | 2018-04-30 16:05:37 +0200 |
| commit | df0fcb5a83c22c4914437060bbe395b5724ef9ad (patch) | |
| tree | 5ff16c97470282b29b2a6adce367df6c29171736 | |
| parent | Critical fix: python parsing broken with previous merge. This should fix it, ... (diff) | |
restructure docker files
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | docker/Dockerfile (renamed from Dockerfile) | 0 | ||||
| -rw-r--r-- | docker/Dockerfile.base (renamed from Dockerfile.base) | 0 | ||||
| -rw-r--r-- | scripts/deploy.sh | 2 |
4 files changed, 2 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore index 8532bbd6d..ae09cac97 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,3 +12,4 @@ Vagrantfile .gitignore .travis.yml *.log +docker diff --git a/Dockerfile b/docker/Dockerfile index 350e38ec0..350e38ec0 100644 --- a/Dockerfile +++ b/docker/Dockerfile diff --git a/Dockerfile.base b/docker/Dockerfile.base index 32d017540..32d017540 100644 --- a/Dockerfile.base +++ b/docker/Dockerfile.base diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 0da886fe2..d982bcbcf 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -6,7 +6,7 @@ if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "Building image" - docker build -t pythondiscord/bot:latest . + docker build -t pythondiscord/bot:latest -f docker/Dockerfile . echo "Pushing image" docker push pythondiscord/bot:latest |