diff options
| author |  Christopher Baklid <[email protected]> | 2018-04-30 16:16:32 +0200 |
|---|---|---|
| committer | Christopher Baklid <[email protected]> | 2018-04-30 16:16:32 +0200 |
| commit | a796d3d76fc1c12bb85659197add8b8805bbf9ba (patch) | |
| tree | 7a5cf12adf85ee5e1b8fb3f1063407fadd921568 | |
| parent | [Wiki] Add Minecraft to the sidebar (diff) | |
restructure docker
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | docker/Dockerfile (renamed from Dockerfile) | 1 | ||||
| -rw-r--r-- | docker/Dockerfile.base (renamed from Dockerfile.base) | 2 | ||||
| -rw-r--r-- | scripts/deploy.sh | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore index 797f4db4..210f85f9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,3 +12,4 @@ Vagrantfile .coveragerc .gitignore .travis.yml +docker diff --git a/Dockerfile b/docker/Dockerfile index 3899084a..cb2b1b5f 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -7,6 +7,7 @@ ENV PIPENV_HIDE_EMOJIS=1 RUN pip install pipenv +RUN mkdir -p /site COPY . /site WORKDIR /site ENV PYTHONPATH=/site diff --git a/Dockerfile.base b/docker/Dockerfile.base index c5234997..87c6fd73 100644 --- a/Dockerfile.base +++ b/docker/Dockerfile.base @@ -11,7 +11,7 @@ ENV PIPENV_HIDE_EMOJIS=1 RUN pip install pipenv -RUN mkdir /site +RUN mkdir -p /site COPY Pipfile /site COPY Pipfile.lock /site WORKDIR /site diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 9bdff580..96723aa6 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/site:latest . + docker build -t pythondiscord/site:latest -f docker/Dockerfile . echo "Pushing image" docker push pythondiscord/site:latest |