Merge pull request #80 from resin-io/armv5-supervisor

Add build info for armv5

CHANGELOG.md

@@ -1,4 +1,5 @@
-
+* Set GOARM separately for each architecture [Pablo]
+* Add armv5 (armel) build [Trong]
 * Add OOM protection for the supervisor container, openvpn and connmand [Praneeth]
 
 # v1.3.2

Dockerfile.armel

@@ -0,0 +1,41 @@
+FROM resin/armel-node:0.10.40-slim
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
+
+# Supervisor apt dependencies
+RUN apt-get -q update \
+	&& apt-get install -qqy socat supervisor --no-install-recommends \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/
+
+# Copy supervisord configuration files
+COPY config/supervisor/ /etc/supervisor/
+
+# Install dependencies
+WORKDIR /app
+COPY package.json postinstall.sh /app/
+RUN apt-get -q update \
+	&& apt-get install -qqy g++ libsqlite3-dev make --no-install-recommends \
+	&& JOBS=MAX npm install --unsafe-perm --production --no-optional \
+	&& npm dedupe \
+	&& npm cache clean \
+	&& rm -rf /tmp/* \
+	&& apt-get purge -qqy g++ libsqlite3-dev make binutils \
+	&& apt-get clean \
+	&& apt-get autoremove -qqy \
+	&& rm -rf /var/lib/apt/lists/
+
+# Copy source
+COPY . /app/
+
+RUN chmod +x /app/src/enterContainer.sh \
+	&& /app/node_modules/.bin/coffee -c /app/src \
+	&& ln -sf /app/entry.sh /start # Needed for legacy
+
+RUN chmod +x /app/bin/gosuper
+
+ENV SUPERVISOR_IMAGE resin/armel-supervisor
+ENV CONFIG_MOUNT_POINT /boot/config.json
+ENV LED_FILE /dev/null
+
+ENTRYPOINT ["/app/entry.sh"]

Makefile

@@ -1,6 +1,6 @@
 DISABLE_CACHE = 'false'
 
-ARCH = rpi# rpi/amd64/i386/armv7hf
+ARCH = rpi# rpi/amd64/i386/armv7hf/armel
 
 DEPLOY_REGISTRY =
 
@@ -18,9 +18,15 @@ MIXPANEL_TOKEN = bananasbananas
 
 ifeq ($(ARCH),rpi)
 	GOARCH = arm
+	GOARM = 6
 endif
 ifeq ($(ARCH),armv7hf)
 	GOARCH = arm
+	GOARM = 7
+endif
+ifeq ($(ARCH),armel)
+	GOARCH = arm
+	GOARM = 5
 endif
 ifeq ($(ARCH),i386)
 	GOARCH = 386
@@ -77,7 +83,7 @@ go-builder:
 gosuper: go-builder
 	-mkdir -p bin
 	-docker rm --volumes -f resin_build_gosuper_$(JOB_NAME) || true
-	docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) resin/go-supervisor-builder:$(SUPERVISOR_VERSION)
+	docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) -e GOARM=$(GOARM) resin/go-supervisor-builder:$(SUPERVISOR_VERSION)
 	docker rm --volumes -f resin_build_gosuper_$(JOB_NAME)
 	mv gosuper/bin/linux_$(GOARCH)/gosuper bin/gosuper