ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 13:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Add changelog for alpine super and fix version reporting
This commit is contained in:
Pablo Carranza Vélez 2016-05-19 13:37:28 -03:00
commit 1780a49030
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

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

3
Dockerfile.alpine.amd64
View File

@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
RUN chmod +x /app/bin/gosuper 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 CONFIG_MOUNT_POINT /boot/config.json
ENV LED_FILE /dev/null ENV LED_FILE /dev/null

3
Dockerfile.alpine.armv7hf
View File

@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
RUN chmod +x /app/bin/gosuper 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 CONFIG_MOUNT_POINT /boot/config.json
ENV LED_FILE /dev/null ENV LED_FILE /dev/null

3
Dockerfile.alpine.i386
View File

@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
RUN chmod +x /app/bin/gosuper 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 CONFIG_MOUNT_POINT /boot/config.json
ENV LED_FILE /dev/null ENV LED_FILE /dev/null

3
Dockerfile.alpine.rpi
View File

@ -32,7 +32,8 @@ RUN /app/node_modules/.bin/coffee -c /app/src \
RUN chmod +x /app/bin/gosuper 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 CONFIG_MOUNT_POINT /boot/config.json
ENV LED_FILE /dev/null ENV LED_FILE /dev/null

5
src/utils.coffee
View File

@ -14,7 +14,10 @@ logger = require './lib/logger'
utils = exports utils = exports
# Parses package.json and returns resin-supervisor's version # 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) mixpanelClient = mixpanel.init(config.mixpanelToken)