Commit a57d347f authored by Alexandre Bulté's avatar Alexandre Bulté
Browse files

allow repository override

parent e7015e51
...@@ -4,14 +4,14 @@ EXPOSE 5600 ...@@ -4,14 +4,14 @@ EXPOSE 5600
WORKDIR /srv WORKDIR /srv
RUN git clone https://git.opendatafrance.net/validata/validata-core.git ARG VALIDATA_CORE_REPO=git+https://git.opendatafrance.net/validata/validata-core.git
RUN cd validata-core && pip install -e . ARG VALIDATA_API_REPO=git+https://git.opendatafrance.net/validata/validata-api.git
RUN git clone https://git.opendatafrance.net/validata/validata-api.git
RUN cd validata-api && pip install -e .
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_ENV=development
ENV FLASK_RUN_PORT=5600 ENV FLASK_RUN_PORT=5600
WORKDIR validata-api/
CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"] CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"]
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/
...@@ -2,10 +2,30 @@ version: '3' ...@@ -2,10 +2,30 @@ version: '3'
services: services:
api: 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: ports:
- 5600:5600 - 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: 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: ports:
- 5601:5601 - 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/
...@@ -4,14 +4,14 @@ EXPOSE 5601 ...@@ -4,14 +4,14 @@ EXPOSE 5601
WORKDIR /srv WORKDIR /srv
RUN git clone https://git.opendatafrance.net/validata/validata-core.git ARG VALIDATA_CORE_REPO=git+https://git.opendatafrance.net/validata/validata-core.git
RUN cd validata-core && pip install -e . ARG VALIDATA_UI_REPO=git+https://git.opendatafrance.net/validata/validata-ui.git
RUN git clone https://git.opendatafrance.net/validata/validata-ui.git
RUN cd validata-ui && pip install -e . RUN pip install $VALIDATA_CORE_REPO
RUN pip install $VALIDATA_UI_REPO
ENV FLASK_APP=validata_ui ENV FLASK_APP=validata_ui
ENV FLASK_ENV=development ENV FLASK_ENV=development
ENV FLASK_RUN_PORT=5601 ENV FLASK_RUN_PORT=5601
WORKDIR validata-ui/
CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"] CMD ["flask", "run", "--with-threads", "-h", "0.0.0.0"]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment