fix for binary builds

.dockerignore

@@ -1,5 +1,4 @@
 .git
-dist
 node_modules
 static/index.seo.html
 faucet-config.json

.github/workflows/build-latest-v2.yml

@@ -180,21 +180,22 @@ jobs:
     needs: [run_tests]
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Set up QEMU
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.15.0
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          tags: pk910/powfaucet:v2-latest
+      - run: npm install
+      - run: npm run bundle
+      - name: Build v2-latest docker image
+        run: docker build . --file Dockerfile --tag pk910/powfaucet:v2-latest
+      - name: Push v2-latest docker image
+        run: docker push pk910/powfaucet:v2-latest

Dockerfile

@@ -1,10 +1,8 @@
-FROM nikolaik/python-nodejs:python3.10-nodejs18-slim
+FROM node:18-slim
 WORKDIR /app
-COPY . /app
-RUN npm install
-RUN npm run build
-
-COPY . .
+COPY dist ./dist
+COPY static ./static
+COPY faucet-config.example.yaml .
 
 EXPOSE 8080
-ENTRYPOINT [ "node", "dist/app.js" ]
+ENTRYPOINT [ "node", "dist/powfaucet.js" ]

package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0",
   "description": "PoW Faucet Server",
   "main": "dist/app.js",
-  "bin": "dist/app.js",
+  "bin": "dist/powfaucet.js",
   "scripts": {
     "build": "tsc",
     "start": "tsc && node dist/app.js",

src/app.ts

@@ -1,5 +1,6 @@
+import path from "path";
 import { isMainThread, workerData } from "node:worker_threads";
-import { loadFaucetConfig } from "./config/FaucetConfig";
+import { loadFaucetConfig, setAppBasePath } from "./config/FaucetConfig";
 import { FaucetWorkers } from "./common/FaucetWorker";
 import { EthWalletManager } from "./eth/EthWalletManager";
 import { FaucetHttpServer } from "./webserv/FaucetHttpServer";
@@ -16,6 +17,7 @@ import { SessionManager } from "./session/SessionManager";
     FaucetWorkers.loadWorkerClass();
   }
   else {
+    setAppBasePath(path.join(__dirname, ".."))
     loadFaucetConfig()
     ServiceManager.GetService(FaucetProcess).initialize();
     ServiceManager.GetService(FaucetWorkers).initialize(__filename);

src/config/FaucetConfig.ts

@@ -49,6 +49,10 @@ else
 
 export let faucetConfig: IConfigSchemaV2 = null;
 
+export function setAppBasePath(basePath: string) {
+  internalBasePath = basePath;
+}
+
 export function loadFaucetConfig(loadDefaultsOnly?: boolean) {
   let config: IConfigSchemaV2;
   let configFile = faucetConfigFile;