diff --git a/dockercoins/hasher/Dockerfile b/dockercoins/hasher/Dockerfile index 62be9282..bc9483c2 100644 --- a/dockercoins/hasher/Dockerfile +++ b/dockercoins/hasher/Dockerfile @@ -1,6 +1,6 @@ FROM ruby:alpine RUN apk add --update build-base curl -RUN gem install sinatra +RUN gem install sinatra -v 3.1.0 RUN gem install thin ADD hasher.rb / CMD ["ruby", "hasher.rb"] diff --git a/dockercoins/webui/Dockerfile b/dockercoins/webui/Dockerfile index 5e8c9be6..f6b947e3 100644 --- a/dockercoins/webui/Dockerfile +++ b/dockercoins/webui/Dockerfile @@ -1,7 +1,8 @@ -FROM node:4-slim +FROM node:23-slim +WORKDIR /app RUN npm install express RUN npm install redis -COPY files/ /files/ -COPY webui.js / +COPY files/ files/ +COPY webui.js . CMD ["node", "webui.js"] EXPOSE 80 diff --git a/dockercoins/webui/webui.js b/dockercoins/webui/webui.js index 5b2bdc5e..ca3f7a42 100644 --- a/dockercoins/webui/webui.js +++ b/dockercoins/webui/webui.js @@ -2,7 +2,10 @@ var express = require('express'); var app = express(); var redis = require('redis'); -var client = redis.createClient(6379, 'redis'); +var client = redis.createClient({ + url: 'redis://redis:6379' +}); + client.on("error", function (err) { console.error("Redis error", err); }); @@ -12,21 +15,26 @@ app.get('/', function (req, res) { }); app.get('/json', function (req, res) { - client.hlen('wallet', function (err, coins) { - client.get('hashes', function (err, hashes) { - var now = Date.now() / 1000; - res.json( { - coins: coins, - hashes: hashes, - now: now - }); + client.hLen('wallet').then(coins => { + client.get('hashes').then( + hashes => + { + var now = Date.now() / 1000; + res.json({ + coins: coins, + hashes: hashes, + now: now + }); }); }); }); app.use(express.static('files')); -var server = app.listen(80, function () { + +client.connect().then(() => { + var server = app.listen(80, function () { console.log('WEBUI running on port 80'); + }); });