diff --git a/app/Dockerfile.dev b/app/Dockerfile.dev deleted file mode 100644 index 0b15c67bc..000000000 --- a/app/Dockerfile.dev +++ /dev/null @@ -1,7 +0,0 @@ -FROM app:build - -WORKDIR /app - -COPY ./requirements_dev.txt /app/requirements_dev.txt - -RUN pip install -r requirements_dev.txt --no-cache-dir --disable-pip-version-check diff --git a/app/requirements.txt b/app/requirements.txt index 98222e682..3769dab7d 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,2 +1,5 @@ Django==1.10.3 +coverage==4.2 +flake8==3.0.4 +ipdb==0.10.1 psycopg2==2.6.1 diff --git a/app/requirements_dev.txt b/app/requirements_dev.txt deleted file mode 100644 index 2f53ba7b4..000000000 --- a/app/requirements_dev.txt +++ /dev/null @@ -1,3 +0,0 @@ -ipdb==0.10.1 -coverage==4.2 -flake8==3.0.4 diff --git a/docker-compose.yml b/docker-compose.yml index 48121c815..0cc9b43e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ app: - image: app:dev + image: app:build env_file: .env stdin_open: true tty: true diff --git a/scripts/build.sh b/scripts/build.sh index 6da8fbcab..fc800307a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,3 @@ #/bin/bash ./scripts/echo_version_json.sh > ./app/version.json docker build -f app/Dockerfile -t app:build app/ -docker build -f app/Dockerfile.dev -t app:dev app/