ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-12 16:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #447 via VersionBot

Browse Source 
Switch to generating the BASE_IMAGE_VERSION in the makefile, so that the makefile targets can use an accurate version by default
This commit is contained in:
resin-io-versionbot[bot] 2017-06-06 17:52:41 +00:00 committed by GitHub
commit 2b699851d4
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v4.3.0 - 2017-06-05
* Switch to generating the BASE_IMAGE_VERSION in the makefile, so that the makefile targets can use an accurate version by default [Pagan Gazzard]
## v4.2.4 - 2017-05-12 ## v4.2.4 - 2017-05-12
* Fix typo in how hostOSVersionPath was camel-cased [Pablo Carranza Velez] * Fix typo in how hostOSVersionPath was camel-cased [Pablo Carranza Velez]

6
Makefile
View File

@ -25,7 +25,8 @@ ARCH = rpi# rpi/amd64/i386/armv7hf/armel
DEPLOY_REGISTRY = DEPLOY_REGISTRY =
SUPERVISOR_VERSION = master SUPERVISOR_VERSION = master
ESCAPED_BASE_IMAGE_TAG = resin\/$(ARCH)-supervisor-base:$(SUPERVISOR_VERSION) BASE_IMAGE_VERSION = $(shell find base-image -print0 | LC_ALL=C sort -z | tar --null -cf - --no-recursion --mtime=@0 --owner=root --group=root --numeric-owner -T - | md5sum | awk -F " " '{print $$1}')
ESCAPED_BASE_IMAGE_TAG = resin\/$(ARCH)-supervisor-base:$(BASE_IMAGE_VERSION)
DOCKER_VERSION:=$(shell docker version --format '{{.Server.Version}}') DOCKER_VERSION:=$(shell docker version --format '{{.Server.Version}}')
DOCKER_MAJOR_VERSION:=$(word 1, $(subst ., ,$(DOCKER_VERSION))) DOCKER_MAJOR_VERSION:=$(word 1, $(subst ., ,$(DOCKER_VERSION)))
@ -226,4 +227,7 @@ test-integration: gosuper
resin/go-supervisor-$(ARCH):$(SUPERVISOR_VERSION) \ resin/go-supervisor-$(ARCH):$(SUPERVISOR_VERSION) \
go test -v ./supertest go test -v ./supertest
base-image-version:
@echo $(BASE_IMAGE_VERSION)
.PHONY: supervisor deploy supervisor-dind run-supervisor gosuper nodesuper .PHONY: supervisor deploy supervisor-dind run-supervisor gosuper nodesuper

2
automation/jenkins_build.sh
View File

@ -6,7 +6,7 @@ export ESCAPED_BRANCH_NAME=$(echo $sourceBranch | sed 's/[^a-z0-9A-Z_.-]/-/g')
git submodule update --init --recursive git submodule update --init --recursive
git clean -fxd base-image git clean -fxd base-image
git submodule foreach --recursive git clean -fxd git submodule foreach --recursive git clean -fxd
BASE_IMAGE_VERSION=$(find base-image -print0 | LC_ALL=C sort -z | tar --null -cf - --no-recursion --mtime=@0 --owner=root --group=root --numeric-owner -T - | md5sum | awk -F " " '{print $1}') BASE_IMAGE_VERSION=$(make base-image-version)
export BASE_IMAGE_REPO=resin/$ARCH-supervisor-base export BASE_IMAGE_REPO=resin/$ARCH-supervisor-base
export BASE_IMAGE_TAG=resin/$ARCH-supervisor-base:$BASE_IMAGE_VERSION export BASE_IMAGE_TAG=resin/$ARCH-supervisor-base:$BASE_IMAGE_VERSION

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "4.2.4", "version": "4.3.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",