From c18e4a7d6d7573734f8d7f5017660aaa123f6057 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 16 Jun 2021 10:34:39 +0200 Subject: [PATCH] Don't require basic auth while developing --- docker-compose.dev.yml | 4 ++-- docker-compose.prod.yml | 31 +++++++++++++++++++++++++++++++ docker-compose.yml | 21 +-------------------- 3 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 304efbb..ae95e75 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,6 +1,6 @@ version: '3.4' services: - web: + identifier: ports: - - "80:80" + - "80:80" \ 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