From a796d3d76fc1c12bb85659197add8b8805bbf9ba Mon Sep 17 00:00:00 2001
From: Christopher Baklid <christopherb@unity3d.com>
Date: Mon, 30 Apr 2018 16:16:32 +0200
Subject: restructure docker

---
 .dockerignore          |  1 +
 Dockerfile             | 20 --------------------
 Dockerfile.base        | 20 --------------------
 docker/Dockerfile      | 21 +++++++++++++++++++++
 docker/Dockerfile.base | 20 ++++++++++++++++++++
 scripts/deploy.sh      |  2 +-
 6 files changed, 43 insertions(+), 41 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 Dockerfile.base
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/Dockerfile.base

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/Dockerfile
deleted file mode 100644
index 3899084a..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM pythondiscord/site-base:latest
-
-ENV PIPENV_VENV_IN_PROJECT=1
-ENV PIPENV_IGNORE_VIRTUALENVS=1
-ENV PIPENV_NOSPIN=1
-ENV PIPENV_HIDE_EMOJIS=1
-
-RUN pip install pipenv
-
-COPY . /site
-WORKDIR /site
-ENV PYTHONPATH=/site
-
-RUN pipenv clean
-RUN pipenv sync
-
-EXPOSE 10012
-
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["pipenv", "run", "start"]
diff --git a/Dockerfile.base b/Dockerfile.base
deleted file mode 100644
index c5234997..00000000
--- a/Dockerfile.base
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM python:3.6-alpine
-
-RUN apk add --update tini
-RUN apk add --update git
-RUN apk add --update build-base
-
-ENV PIPENV_VENV_IN_PROJECT=1
-ENV PIPENV_IGNORE_VIRTUALENVS=1
-ENV PIPENV_NOSPIN=1
-ENV PIPENV_HIDE_EMOJIS=1
-
-RUN pip install pipenv
-
-RUN mkdir /site
-COPY Pipfile /site
-COPY Pipfile.lock /site
-WORKDIR /site
-ENV PYTHONPATH=/site
-
-RUN pipenv sync
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 00000000..cb2b1b5f
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,21 @@
+FROM pythondiscord/site-base:latest
+
+ENV PIPENV_VENV_IN_PROJECT=1
+ENV PIPENV_IGNORE_VIRTUALENVS=1
+ENV PIPENV_NOSPIN=1
+ENV PIPENV_HIDE_EMOJIS=1
+
+RUN pip install pipenv
+
+RUN mkdir -p /site
+COPY . /site
+WORKDIR /site
+ENV PYTHONPATH=/site
+
+RUN pipenv clean
+RUN pipenv sync
+
+EXPOSE 10012
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["pipenv", "run", "start"]
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
new file mode 100644
index 00000000..87c6fd73
--- /dev/null
+++ b/docker/Dockerfile.base
@@ -0,0 +1,20 @@
+FROM python:3.6-alpine
+
+RUN apk add --update tini
+RUN apk add --update git
+RUN apk add --update build-base
+
+ENV PIPENV_VENV_IN_PROJECT=1
+ENV PIPENV_IGNORE_VIRTUALENVS=1
+ENV PIPENV_NOSPIN=1
+ENV PIPENV_HIDE_EMOJIS=1
+
+RUN pip install pipenv
+
+RUN mkdir -p /site
+COPY Pipfile /site
+COPY Pipfile.lock /site
+WORKDIR /site
+ENV PYTHONPATH=/site
+
+RUN pipenv sync
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
-- 
cgit v1.2.3