diff --git a/Dockerfile b/Dockerfile index 5e08a1291bc08e8cc72b8f3fd07180e693bbddf2..43ca107546fe4a92dae9e0bcffbdbcb81894ca97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,10 @@ RUN python -m venv /venv \ && . /venv/bin/activate \ && pip install --no-cache-dir -r /requirements.txt +ARG CSENTRY_BUILD +COPY requirements-dev.txt /requirements-dev.txt +RUN if [ "$CSENTRY_BUILD" = "DEV" ] ; then /venv/bin/pip install --no-cache-dir -r /requirements-dev.txt ; fi + FROM base RUN groupadd -r -g 1000 csi \ diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c013955a7e8ba9c087d1680b14615c0840782b86..239d28fb7d78aefd486a3cab25dae32ee64dad65 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,10 @@ -version: '2' +version: '3' services: web: - build: . + build: + context: . + args: + CSENTRY_BUILD: DEV environment: LOCAL_SETTINGS: /app/settings.cfg FLASK_APP: /app/wsgi.py diff --git a/docker-compose.yml b/docker-compose.yml index f76582939b94284277a2931ba8296b1d495a7900..7700c3226b894d294daa2f9752ea8f06acbb92d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: web: image: registry.esss.lu.se/ics-infrastructure/csentry:master