IPv6 support

.gitmodules

@@ -1,11 +1,10 @@
-[submodule "base-image/meta-nodejs"]
-	path = base-image/meta-nodejs
-	url = https://github.com/imyller/meta-nodejs.git
-	branch = krogoth
 [submodule "base-image/oe-core"]
 	path = base-image/oe-core
 	url = git://git.openembedded.org/openembedded-core
 	branch = krogoth
 [submodule "base-image/bitbake"]
 	path = base-image/bitbake
 	url = git://git.openembedded.org/bitbake
+[submodule "base-image/meta-oe"]
+	path = base-image/meta-oe
+	url = git://git.openembedded.org/meta-openembedded

Dockerfile

@@ -23,7 +23,11 @@ RUN apt-get -qq update \
 		sudo \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN locale-gen en_US.UTF-8
+RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
+	&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+	&& echo "LANG=en_US.UTF-8" > /etc/locale.conf \
+	&& locale-gen en_US.UTF-8
+
 ENV LANG en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
 
@@ -102,16 +106,15 @@ RUN rsync -a --delete /go/bin/gosuper /build/
 
 # The node version here should match the version of the runtime image which is
 # specified in the base-image subdirectory in the project
-FROM resin/rpi-node:6.5-slim as rpi-node-base
-FROM resin/armv7hf-node:6.5-slim as armv7hf-node-base
-FROM resin/armel-node:6.5-slim as armel-node-base
-FROM resin/aarch64-node:6.5-slim as aarch64-node-base
+FROM resin/rpi-node:8.9-slim as rpi-node-base
+FROM resin/armv7hf-node:8.9-slim as armv7hf-node-base
+FROM resin/aarch64-node:8.9-slim as aarch64-node-base
 
-FROM resin/amd64-node:6.5-slim as amd64-node-base
+FROM resin/amd64-node:8.9-slim as amd64-node-base
 RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \
 	&& echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-end && chmod +x /usr/bin/cross-build-end
 
-FROM resin/i386-node:6.5-slim as i386-node-base
+FROM resin/i386-node:8.9-slim as i386-node-base
 RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \
 	&& echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-end && chmod +x /usr/bin/cross-build-end
 

base-image/build.sh

@@ -44,7 +44,7 @@ sudo -H -u builder \
 	&& cp -r $SOURCE_DIR/* $BUILD_DIR/ \
 	&& cd $BUILD_DIR \
 	&& source oe-core/oe-init-build-env build bitbake \
-	&& DL_DIR=$SHARED_DOWNLOADS SSTATE_DIR=$SHARED_SSTATE MACHINE=$TARGET_MACHINE $BUILD_DIR/bitbake/bin/bitbake core-image-minimal > /dev/null"
+	&& DL_DIR=$SHARED_DOWNLOADS SSTATE_DIR=$SHARED_SSTATE MACHINE=$TARGET_MACHINE $BUILD_DIR/bitbake/bin/bitbake core-image-minimal"
 tar xzf $BUILD_DIR/build/tmp-glibc/deploy/images/$TARGET_MACHINE/core-image-minimal-$TARGET_MACHINE.tar.gz  -C $DEST_DIR
 # Delete the sstate and downloads directory so that the resulting image isn't huge
 # If https://github.com/moby/moby/issues/32507 gets implemented we can start using

base-image/build/conf/bblayers.conf

@@ -7,6 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ${TOPDIR}/../oe-core/meta \
-  ${TOPDIR}/../meta-nodejs \
+  ${TOPDIR}/../meta-oe/meta-oe \
   ${TOPDIR}/../meta-resin-supervisor \
   "

base-image/build/conf/local.conf

@@ -222,4 +222,4 @@ CONF_VERSION = "1"
 IMAGE_INSTALL_append += " btrfs-tools ca-certificates iptables nodejs rsync"
 VIRTUAL-RUNTIME_init_manager="busybox"
 VIRTUAL-RUNTIME_dev_manager="busybox-mdev"
-PREFERRED_VERSION_nodejs = "6.5.0"
+# PREFERRED_VERSION_nodejs = "8.9.0"

src/app.coffee

@@ -1,3 +1,14 @@
+do ->
+	# Make NodeJS RFC 3484 compliant for properly handling IPv6
+	# See: https://github.com/nodejs/node/pull/14731
+	#      https://github.com/nodejs/node/pull/17793
+	dns = require('dns')
+	{ lookup } = dns
+	dns.lookup = (name, opts, cb) ->
+		if typeof cb isnt 'function'
+			return lookup(name, { verbatim: true }, opts)
+		return lookup(name, Object.assign({ verbatim: true }, opts), cb)
+
 require('log-timestamp')
 process.on 'uncaughtException', (e) ->
 	console.error('Got unhandled exception', e, e?.stack)