From 8b4f54f5eef125cc9261d62c7cf55906d95bb00c Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 4 May 2020 20:15:29 +0100 Subject: [PATCH] Fixes for npm with env vars --- Dockerfile | 5 +---- init.sh | 2 -- relay_supervisor.conf | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 init.sh diff --git a/Dockerfile b/Dockerfile index f00c068..54d896f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN npm install nodemon --save-dev RUN npm install express --save-dev RUN npm install webpack webpack-cli --save-dev -RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git +RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl RUN npm install --quiet node-gyp -g RUN npm install sqlite3 --build-from-source --save-dev @@ -71,9 +71,6 @@ VOLUME /relay/.lnd COPY ./lnd.conf.sample /relay/.lnd/lnd.conf -COPY init.sh /etc/profile.d/ -RUN sudo chmod +x /etc/profile.d/init.sh - RUN mkdir -p /var/log/supervisor COPY ./supervisord.conf /etc/supervisord.conf COPY ./lnd_supervisor.conf /etc/supervisor.d/lnd_supervisor.ini diff --git a/init.sh b/init.sh deleted file mode 100644 index d805250..0000000 --- a/init.sh +++ /dev/null @@ -1,2 +0,0 @@ -NODE_IP=$(curl http://169.254.170.2/v4/e52231f4-0246-4fc5-bc3e-ac20df1b118e | echo $(jq -r .DockerName).$NODE_DOMAIN) -NODE_ALIAS=$(curl http://169.254.170.2/v4/e52231f4-0246-4fc5-bc3e-ac20df1b118e | echo $(jq -r .DockerName)) \ No newline at end of file diff --git a/relay_supervisor.conf b/relay_supervisor.conf index 7eebc4c..2f66940 100644 --- a/relay_supervisor.conf +++ b/relay_supervisor.conf @@ -1,6 +1,6 @@ [program:relay] user=root -command=npm start --prefix /relay/ +command=npm run start-ecs --prefix /relay/ startretries=999999999999999999999999999 autostart=true autorestart=true \ No newline at end of file