fix lwsadmin

Makefile

@@ -1,7 +1,7 @@
 init:
-	git clone --recursive --branch release-v0.3_0.18 https://github.com/vtnerd/monero-lws
+	git clone --recursive --branch develop https://github.com/vtnerd/monero-lws
 	git clone https://github.com/lalanza808/docker-monero-node
-	git clone https://github.com/lalanza808/mymonero-web-js
+	git clone https://github.com/CryptoGrampy/mymonero-web-js
 
 release:
 	docker-compose -f release.compose.yaml build

README.md

@@ -8,21 +8,9 @@ Monero lightwallet project. Packages the following services in one package:
 * `mymonero-web` by [MyMonero](https://mymonero.com) but forked and cleaned up for personal use by [CryptoGrampy](https://github.com/CryptoGrampy/mymonero-web-js) - the web wallet client
 
 
-## Running
+## Setup
 
-The default compose stack pulls in images which were pre-built for ease of use. See the `development` section to build everything locally.
+Works on Linux, built on Ubuntu 22.
-
-Otherwise, clone the repo and run: `docker-compose up -d`
-
-- `lwsadmin` will be available at http://127.0.0.1:5000
-- `mymonero-web` will be available at http://127.0.0.1:9110
-- `monero-lws` will be available at http://127.0.0.1:8080 (rpc) and http://127.0.0.1:8081 (admin)
-- `monerod` will be available at :18080 (p2p), :18081 (unrestricted rpc), :18082 (zmq), and :18089 (restricted rpc)
-
-
-## Development
-
-Built on Ubuntu 22.04
 
 1. Install packages
 2. Clone the repo
@@ -44,7 +32,7 @@ git clone https://github.com/lalanza808/docker-monero-node
 git clone https://github.com/CryptoGrampy/mymonero-web-js
 
 # 4
-docker-compose build # builds images from the nested repos
+docker-compose build
 
 # 5
 docker-compose up -d

docker-compose.yaml

@@ -12,10 +12,7 @@ volumes:
 services:
   lwsadmin:
     container_name: lwsadmin
-    build:
+    image: lalanza808/lwsadmin:latest
-      context: lwsadmin
-      dockerfile: Dockerfile
-    # image: lalanza808/lwsadmin:latest
     restart: unless-stopped
     depends_on:
       - monero-lws
@@ -37,14 +34,11 @@ services:
     <<: *log-config
   mymonero-web:
     container_name: mymonero-web
-    # image: lalanza808/mymonero-web-js:latest
+    image: lalanza808/mymonero-web-js:latest
-    build:
-      context: mymonero-web-js
-      dockerfile: Dockerfile
     restart: unless-stopped
     environment:
       MYMONERO_WEB_NETTYPE: 0
-      MYMONERO_WEB_SERVER_URL: http://127.0.0.1:8080/
+      MYMONERO_WEB_SERVER_URL: http://localhost:8080/
       MYMONERO_WEB_APP_NAME: LZAXMR
     ports:
       - 127.0.0.1:9110:80
@@ -53,10 +47,12 @@ services:
     <<: *log-config
   monero-lws:
     container_name: monero-lws
-    # image: lalanza808/monero-lws:989b8cd8574797efa66b3b06bc077b6e36ebc074
+    image: lalanza808/monero-lws:develop
-    build:
+    # build:
-      context: monero-lws
+    #   context: monero-lws
-      dockerfile: Dockerfile
+    #   dockerfile: Dockerfile
+    #   args:
+    #     NPROC: 16
     restart: unless-stopped
     depends_on:
       - monerod
@@ -68,18 +64,15 @@ services:
       - 8081/tcp
     volumes:
       - lws:/home/monero-lws/.bitmonero/light_wallet_server
-    environment:
-      SCAN_THREADS: ${SCAN_THREADS:-4}
-      REST_THREADS: ${REST_THREADS:-2}
     command:
-      --scan-threads ${SCAN_THREADS} --rest-threads ${REST_THREADS} --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 "*"
+      --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
-    # image: lalanza808/monerod:latest
+    image: lalanza808/monerod:v0.18.3.1
-    build:
+    # build:
-      context: docker-monero-node/dockerfiles
+    #   context: docker-monero-node/dockerfiles
-      dockerfile: monero
+    #   dockerfile: monero
     restart: unless-stopped
     volumes:
       - ~/.bitmonero:/srv/monerod
@@ -89,8 +82,6 @@ services:
       - 18082/tcp
       - 18083/tcp
       - 18089/tcp
-    ports:
-      - 127.0.0.1:18081:18081
     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