From 25be1176d2c9b8f5c4f84d224d9938bbe40b37ef Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Wed, 18 May 2016 18:54:14 +0000 Subject: [PATCH] Add changelog for alpine super and fix version reporting --- CHANGELOG.md | 2 ++ Dockerfile.alpine.amd64 | 3 ++- Dockerfile.alpine.armv7hf | 3 ++- Dockerfile.alpine.i386 | 3 ++- Dockerfile.alpine.rpi | 3 ++- src/utils.coffee | 5 ++++- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bace9d6..6a0f03e5 100644 --- a/CHANGELOG.md +++ b/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] diff --git a/Dockerfile.alpine.amd64 b/Dockerfile.alpine.amd64 index 2f90883a..2034f84a 100644 --- a/Dockerfile.alpine.amd64 +++ b/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 diff --git a/Dockerfile.alpine.armv7hf b/Dockerfile.alpine.armv7hf index f70f5809..90804808 100644 --- a/Dockerfile.alpine.armv7hf +++ b/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 diff --git a/Dockerfile.alpine.i386 b/Dockerfile.alpine.i386 index 54b5e378..5a298fdc 100644 --- a/Dockerfile.alpine.i386 +++ b/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 diff --git a/Dockerfile.alpine.rpi b/Dockerfile.alpine.rpi index f70f5809..68341ddf 100644 --- a/Dockerfile.alpine.rpi +++ b/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 diff --git a/src/utils.coffee b/src/utils.coffee index 4e759477..98c15e20 100644 --- a/src/utils.coffee +++ b/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)