From ccb7f4aa38290e8d33277268264784ba959184de Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Mon, 15 Jul 2019 10:46:36 +0200
Subject: [PATCH] Remove some ENV layers, prevent gnupg using ipv6 which takes
 aeons to fail over to ipv4 when its unavailable.

---
 nodejs/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile
index af7d098..077ba49 100644
--- a/nodejs/Dockerfile
+++ b/nodejs/Dockerfile
@@ -3,10 +3,13 @@ FROM gone/marshall:latest
 #RUN groupadd --gid 1000 node \
 #  && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION {{NODE_VERSION}}
-ENV YARN_VERSION {{YARN_VERSION}}
+ENV NODE_VERSION={{NODE_VERSION}} \
+    YARN_VERSION={{YARN_VERSION}} \
+    PATH="/app/node_modules/.bin:${PATH}"
 
-RUN apt-get -qq update && \
+RUN mkdir ~/.gnupg && \
+    echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && \
+    apt-get -qq update && \
     apt-get -yq install --no-install-recommends \
         lsb-core \
         gnupg \
@@ -68,8 +71,6 @@ RUN apt-get -qq update && \
   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
-ENV PATH="/app/node_modules/.bin:${PATH}"
-
 EXPOSE 3000
 
 #HEALTHCHECK --interval=30s --timeout=10s \