From d9a9b55c7bbcd37a27b3200fdd1b996785d8de28 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Thu, 25 May 2023 11:15:01 -0700 Subject: [PATCH] fix script references --- Makefile | 2 +- dev.compose.yaml | 82 ++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index d1ca1ef..c848755 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ build: docker-compose build release: - docker-compose build + docker-compose -f dev.compose.yaml build docker tag monero-lw_mymonero-web lalanza808/mymonero-web:latest docker tag monero-lw_monero-lws lalanza808/lws:latest docker tag monero-lw_lwsadmin lalanza808/lwsadmin:latest diff --git a/dev.compose.yaml b/dev.compose.yaml index 7515943..ce49149 100644 --- a/dev.compose.yaml +++ b/dev.compose.yaml @@ -10,47 +10,47 @@ volumes: lwsadmin: mymonero: services: - # lwsadmin: - # container_name: lwsadmin - # build: - # context: lwsadmin - # dockerfile: Dockerfile - # restart: unless-stopped - # depends_on: - # - monero-lws - # environment: - # LWS_URL: http://monero-lws:8080 - # LWS_ADMIN_URL: http://monero-lws:8081 - # QUART_ENV: production - # HOST: 0.0.0.0 - # DEBUG: 0 - # ports: - # - 127.0.0.1:5000:5000 - # volumes: - # - lwsadmin:/srv/lwsadmin - # user: "1000:1000" - # command: - # ./.venv/bin/poetry run start - # <<: *log-config - # mymonero-web: - # container_name: mymonero-web - # build: - # context: mymonero-web-js - # dockerfile: Dockerfile - # restart: unless-stopped - # environment: - # MYMONERO_WEB_NETTYPE: 0 - # MYMONERO_WEB_SERVER_URL: localhost:8080 - # MYMONERO_WEB_APP_NAME: MyMonero-SelfHosted - # depends_on: - # - monero-lws - # expose: - # - 80/tcp - # ports: - # - 127.0.0.1:8000:80 - # volumes: - # - mymonero:/app - # <<: *log-config + lwsadmin: + container_name: lwsadmin + build: + context: lwsadmin + dockerfile: Dockerfile + restart: unless-stopped + depends_on: + - monero-lws + environment: + LWS_URL: http://monero-lws:8080 + LWS_ADMIN_URL: http://monero-lws:8081 + QUART_ENV: production + HOST: 0.0.0.0 + DEBUG: 0 + ports: + - 127.0.0.1:5000:5000 + volumes: + - lwsadmin:/srv/lwsadmin + user: "1000:1000" + command: + ./.venv/bin/poetry run start + <<: *log-config + mymonero-web: + container_name: mymonero-web + build: + context: mymonero-web-js + dockerfile: Dockerfile + restart: unless-stopped + environment: + MYMONERO_WEB_NETTYPE: 0 + MYMONERO_WEB_SERVER_URL: localhost:8080 + MYMONERO_WEB_APP_NAME: MyMonero-SelfHosted + depends_on: + - monero-lws + expose: + - 80/tcp + ports: + - 127.0.0.1:8000:80 + volumes: + - mymonero:/app + <<: *log-config monero-lws: container_name: monero-lws build: