use separate compose for pushing images

Makefile

@@ -4,7 +4,7 @@ init:
 	git clone https://github.com/CryptoGrampy/mymonero-web-js
 
 release:
-	docker-compose -f dev.compose.yaml build
+	docker-compose -f release.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

dev.compose.yaml

@@ -10,47 +10,6 @@ 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
   monero-lws:
     container_name: monero-lws
     build:

release.compose.yaml

@@ -0,0 +1,93 @@
+version: '3'
+x-log-config: &log-config
+  logging:
+    driver: json-file
+    options:
+      max-size: "50m"
+      max-file: "5"
+volumes:
+  lws:
+  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
+  monero-lws:
+    container_name: monero-lws
+    build:
+      context: monero-lws
+      dockerfile: Dockerfile
+      args:
+        MONERO_BRANCH: release-v0.18
+        MONERO_COMMIT_HASH: 2f45d5c615492dffa456489d73543870e5a224ab
+        NPROC: 4
+    restart: unless-stopped
+    depends_on:
+      - monerod
+    ports:
+      - 127.0.0.1:8081:8081
+      - 127.0.0.1:8080:8080
+    expose:
+      - 8080/tcp
+      - 8081/tcp
+    volumes:
+      - lws:/home/monero-lws/.bitmonero/light_wallet_server
+    command:
+      --scan-threads 4 --rest-threads 4 --rest-server http://0.0.0.0:8080 --admin-rest-server http://0.0.0.0:8081 --log-level 1 --daemon=tcp://monerod:18082 --sub=tcp://monerod:18083 --confirm-external-bind --access-control-origin "*"
+    <<: *log-config
+  monerod:
+    container_name: monerod
+    build:
+      context: docker-monero-node/dockerfiles
+      dockerfile: monero_nocompile
+    restart: unless-stopped
+    volumes:
+      - ~/.bitmonero:/srv/monerod
+    expose:
+      - 18080/tcp
+      - 18081/tcp
+      - 18082/tcp
+      - 18083/tcp
+      - 18089/tcp
+    command:
+      monerod --data-dir /srv/monerod/ --p2p-bind-ip=0.0.0.0 --p2p-bind-port=18080 --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18081 --zmq-rpc-bind-ip=0.0.0.0 --zmq-rpc-bind-port=18082 --zmq-pub tcp://0.0.0.0:18083 --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18089 --non-interactive --confirm-external-bind --public-node
+    <<: *log-config