From df86f50b1f08f24574c15eccf3fbe0daf5c42a5e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 29 Jul 2021 11:55:18 -0700 Subject: change overrides so default is to use a dev build rather than dev webpack --- .gitignore | 1 - docker-compose.dev.yml | 13 +++++++++++++ docker-compose.override.yml | 11 +++++++++++ docker-compose.yml | 9 --------- sample.override.yml | 13 ------------- 5 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 docker-compose.dev.yml create mode 100644 docker-compose.override.yml delete mode 100644 sample.override.yml diff --git a/.gitignore b/.gitignore index 2537982f..58f3c4fe 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ lnurl-server.sqlite3 watcher.log config mysql -docker-compose.override.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 00000000..00397499 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,13 @@ +version: '3.6' +services: + ui: + depends_on: + - app + container_name: ui + image: asoltys/coinos-ui:dev + ports: + - '8085:8085' + environment: + NODE_ENV: development + volumes: + - ../coinos-ui:/coinos diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 00000000..b7318355 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,11 @@ +version: '3.6' +services: + ui: + container_name: ui + image: asoltys/coinos-ui + ports: + - 80:80 + volumes: + - ./config/nginx:/etc/nginx/templates + environment: + HOST: ${HOST} diff --git a/docker-compose.yml b/docker-compose.yml index ad004ad7..9e898822 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,5 @@ version: '3.6' services: - ui: - container_name: ui - image: asoltys/coinos-ui - ports: - - 80:80 - volumes: - - ./config/nginx:/etc/nginx/templates - environment: - HOST: ${HOST} app: container_name: app image: asoltys/coinos-server diff --git a/sample.override.yml b/sample.override.yml deleted file mode 100644 index 00397499..00000000 --- a/sample.override.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '3.6' -services: - ui: - depends_on: - - app - container_name: ui - image: asoltys/coinos-ui:dev - ports: - - '8085:8085' - environment: - NODE_ENV: development - volumes: - - ../coinos-ui:/coinos -- cgit v1.2.3