From 6e02fd1044cebf527234796b0e9d45c2f34ae304 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Sun, 5 Aug 2018 15:52:20 +0200
Subject: [PATCH] Use dev image for development
---
Dockerfile | 4 ++++
docker-compose.override.yml | 7 +++++--
docker-compose.yml | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 5e08a12..43ca107 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 c013955..239d28f 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 f765829..7700c32 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
--
GitLab