allow repository override

api/Dockerfile

@@ -4,14 +4,14 @@ EXPOSE 5600
 
 WORKDIR /srv
 
-RUN git clone https://git.opendatafrance.net/validata/validata-core.git
-RUN cd validata-core && pip install -e .
-RUN git clone https://git.opendatafrance.net/validata/validata-api.git
-RUN cd validata-api && pip install -e .
+ARG VALIDATA_CORE_REPO=git+https://git.opendatafrance.net/validata/validata-core.git
+ARG VALIDATA_API_REPO=git+https://git.opendatafrance.net/validata/validata-api.git
 
-ENV FLASK_APP=validata_api/app.py
+RUN pip install $VALIDATA_CORE_REPO
+RUN pip install $VALIDATA_API_REPO
+
+ENV FLASK_APP=validata_api.app
 ENV FLASK_ENV=development
 ENV FLASK_RUN_PORT=5600
 
-WORKDIR validata-api/
 CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"]

docker-compose.dev.yml

+version: '3'
+
+services:
+  api:
+    build:
+      context: ./api
+      args:
+        VALIDATA_CORE_REPO: git+https://git.opendatafrance.net/abulte/validata-core.git@dev
+        VALIDATA_API_REPO: git+https://git.opendatafrance.net/abulte/validata-api.git@dev
+    ports:
+      - 5600:5600
+    environment:
+      - VALIDATA_SCHEMAS_CONFIG=/schemas/schemas.toml
+    volumes:
+      - /Users/alexandre/Developer/Etalab/schema/schema.data.gouv.fr/:/schemas/
+  ui:
+    build:
+      context: ./ui
+      args:
+        VALIDATA_CORE_REPO: git+https://git.opendatafrance.net/abulte/validata-core.git@dev
+        VALIDATA_UI_REPO: git+https://git.opendatafrance.net/abulte/validata-ui.git@etalab
+    ports:
+      - 5601:5601
+    environment:
+      - VALIDATA_SCHEMAS_CONFIG=/schemas/schemas.toml
+    volumes:
+      - /Users/alexandre/Developer/Etalab/schema/schema.data.gouv.fr/:/schemas/

docker-compose.yml

@@ -2,10 +2,30 @@ version: '3'
 
 services:
   api:
-    build: ./api
+    build:
+      context: ./api
+      # use this to pull validata from your own fork or another branch
+      #args:
+      #  VALIDATA_CORE_REPO: git+https://git.opendatafrance.net/abulte/validata-core.git@dev
+      #  VALIDATA_API_REPO: git+https://git.opendatafrance.net/abulte/validata-api.git@dev
     ports:
       - 5600:5600
+    # use environment and volumes to point to a custom schemas.toml
+    #environment:
+    #  - VALIDATA_SCHEMAS_CONFIG=/schemas/schemas.toml
+    #volumes:
+    #  - /git/schema.data.gouv.fr/:/schemas/
   ui:
-    build: ./ui
+    build:
+      context: ./ui
+      # use this to pull validata from your own fork or another branch
+      #args:
+      #VALIDATA_CORE_REPO: git+https://git.opendatafrance.net/abulte/validata-core.git@dev
+      #VALIDATA_UI_REPO: git+https://git.opendatafrance.net/abulte/validata-ui.git@etalab
     ports:
       - 5601:5601
+    # use environment and volumes to point to a custom schemas.toml
+    #environment:
+    #  - VALIDATA_SCHEMAS_CONFIG=/schemas/schemas.toml
+    #volumes:
+    #  - /git/schema.data.gouv.fr/:/schemas/

ui/Dockerfile

@@ -4,14 +4,14 @@ EXPOSE 5601
 
 WORKDIR /srv
 
-RUN git clone https://git.opendatafrance.net/validata/validata-core.git
-RUN cd validata-core && pip install -e .
-RUN git clone https://git.opendatafrance.net/validata/validata-ui.git
-RUN cd validata-ui && pip install -e .
+ARG VALIDATA_CORE_REPO=git+https://git.opendatafrance.net/validata/validata-core.git
+ARG VALIDATA_UI_REPO=git+https://git.opendatafrance.net/validata/validata-ui.git
+
+RUN pip install $VALIDATA_CORE_REPO
+RUN pip install $VALIDATA_UI_REPO
 
 ENV FLASK_APP=validata_ui
 ENV FLASK_ENV=development
 ENV FLASK_RUN_PORT=5601
 
-WORKDIR validata-ui/
 CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"]