Merge pull request #148 from resin-io/fix-alpine-versioning

Add changelog for alpine super and fix version reporting

CHANGELOG.md

@@ -1,6 +1,8 @@
+* Fix reporting of supervisor version for alpine supervisor [Pablo]
 * Use rwlock to block when pulling images [Pablo]
 * Increase API timeout to 15 minutes, and make it configurable [Pablo]
 * Add endpoint to load images from a docker save tar [Pablo]
+* Add alpine supervisor build information [Trong]
 * Add endpoints to manage images and containers locally [Pablo]
 * Only use bodyParser for endpoints that need it [Pablo]
 * Add RESIN_APP_ID variable [Pablo]

Dockerfile.alpine.amd64

@@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
 
 RUN chmod +x /app/bin/gosuper
 
-ENV SUPERVISOR_IMAGE resin/amd64-alpine-supervisor
+ENV SUPERVISOR_IMAGE resin/amd64-supervisor
+ENV SUPERVISOR_TAG_EXTRA alpine
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 

Dockerfile.alpine.armv7hf

@@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
 
 RUN chmod +x /app/bin/gosuper
 
-ENV SUPERVISOR_IMAGE resin/armhf-alpine-supervisor
+ENV SUPERVISOR_IMAGE resin/armv7hf-supervisor
+ENV SUPERVISOR_TAG_EXTRA alpine
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 

Dockerfile.alpine.i386

@@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
 
 RUN chmod +x /app/bin/gosuper
 
-ENV SUPERVISOR_IMAGE resin/i386-alpine-supervisor
+ENV SUPERVISOR_IMAGE resin/i386-supervisor
+ENV SUPERVISOR_TAG_EXTRA alpine
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 

Dockerfile.alpine.rpi

@@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
 
 RUN chmod +x /app/bin/gosuper
 
-ENV SUPERVISOR_IMAGE resin/armhf-alpine-supervisor
+ENV SUPERVISOR_IMAGE resin/rpi-supervisor
+ENV SUPERVISOR_TAG_EXTRA alpine
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 

src/utils.coffee

@@ -14,7 +14,10 @@ logger = require './lib/logger'
 utils = exports
 
 # Parses package.json and returns resin-supervisor's version
-exports.supervisorVersion = require('../package.json').version
+version = require('../package.json').version
+tagExtra = process.env.SUPERVISOR_TAG_EXTRA
+version += '+' + tagExtra if !_.isEmpty(tagExtra)
+exports.supervisorVersion = version
 
 mixpanelClient = mixpanel.init(config.mixpanelToken)