aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Sebastiaan Zeeff <[email protected]>2020-11-19 00:02:15 +0100
committerGravatar Sebastiaan Zeeff <[email protected]>2020-11-19 00:10:41 +0100
commit8135eee5524206e497f22a1be753a927407ee706 (patch)
treead9f2aad5cda66e7cc36f8e219f4a929c66510f4
parentRemove redundant build commands for Pipfile (diff)
Fix Dockerfile paths & revert error in Dockerfile
I've fixed paths still pointing to the old Dockerfile location. I've also reverted an error that somehow got committed to the Dockerfile.
-rw-r--r--Dockerfile2
-rw-r--r--Pipfile4
-rwxr-xr-xscripts/dev.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index ed199a0..ea05c5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,5 +59,5 @@ FROM venv
ENTRYPOINT ["gunicorn"]
CMD ["-c", "config/gunicorn.conf.py", "snekbox.api.app"]
-COPY docker /snekbox
+COPY . /snekbox
WORKDIR /snekbox
diff --git a/Pipfile b/Pipfile
index af48f23..237c1fa 100644
--- a/Pipfile
+++ b/Pipfile
@@ -61,13 +61,13 @@ devsh = "sh scripts/dev.sh"
build = """
docker build \
-t ghcr.io/python-discord/snekbox:latest \
- -f docker/Dockerfile \
+ -f Dockerfile \
.
"""
builddev = """
docker build \
-t ghcr.io/python-discord/snekbox-venv:dev \
- -f docker/Dockerfile \
+ -f Dockerfile \
--target venv \
--build-arg DEV=1 \
.
diff --git a/scripts/dev.sh b/scripts/dev.sh
index f9fc016..f9cd28e 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -9,7 +9,7 @@ if [ "$1" = "--build" ]; then
docker build \
-t ghcr.io/python-discord/snekbox-venv:dev \
- -f docker/Dockerfile \
+ -f Dockerfile \
--build-arg DEV=1 \
--target venv \
-q \