diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..f2251e5 --- /dev/null +++ b/.env.example @@ -0,0 +1 @@ +COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml \ No newline at end of file diff --git a/.gitignore b/.gitignore index b73c9d7..9f7cac3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ docker-compose.override.yml /data/elasticsearch/** /tmp .DS_STORE +.env /config/migrations/private-data/* diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 304efbb..145f00f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,6 +1,29 @@ version: '3.4' services: - web: + identifier: ports: - "80:80" + restart: "no" + dispatcher: + restart: "no" + triplestore: + restart: "no" + db: + restart: "no" + migrations: + restart: "no" + resource: + restart: "no" + cache: + restart: "no" + uri-info: + restart: "no" + resource-labels-cache: + restart: "no" + resource-labels: + restart: "no" + kalliope-api: + restart: "no" + deltanotifier: + restart: "no" \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000..e963c58 --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,31 @@ +version: '3.4' + +x-logging: + &default-logging + driver: "json-file" + options: + max-size: "10m" + max-file: "3" + +services: + web: + image: nginx + volumes: + - ./config/proxy:/etc/nginx/conf.d + - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro + links: + - identifier:identifier + labels: + - "logging=true" + restart: always + logging: *default-logging + ports: + - "80:80" + frontend: + image: lblod/frontend-contact-hub + labels: + - "logging=true" + environment: + EMBER_METIS_BASE_URL: "http://data.lblod.info/id/" + restart: always + logging: *default-logging diff --git a/docker-compose.yml b/docker-compose.yml index eaa8d2f..13a0a2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,17 +17,6 @@ services: - "logging=true" restart: always logging: *default-logging - web: - image: nginx - volumes: - - ./config/proxy:/etc/nginx/conf.d - - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro - links: - - identifier:identifier - labels: - - "logging=true" - restart: always - logging: *default-logging dispatcher: image: semtech/mu-dispatcher:latest volumes: @@ -124,12 +113,4 @@ services: deltanotifier: image: semtech/mu-delta-notifier:0.1.0 volumes: - - ./config/delta:/config - frontend: - image: lblod/frontend-contact-hub - labels: - - "logging=true" - environment: - EMBER_METIS_BASE_URL: "http://data.lblod.info/id/" - restart: always - logging: *default-logging + - ./config/delta:/config \ No newline at end of file