mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-04-16 15:28:52 +00:00
Cleanup Makefile for using the currently used deployment repos as sources
This commit is contained in:
parent
19e066bf24
commit
f13d25ba85
44
Makefile
44
Makefile
@ -2,13 +2,9 @@ DISABLE_CACHE = 'false'
|
||||
|
||||
IMAGE = resin/rpi-supervisor
|
||||
|
||||
SUPERVISOR_REGISTRY = registry.staging.resin.io
|
||||
|
||||
SUPERVISOR_VERSION = latest
|
||||
|
||||
BUILDSTEP_REGISTRY = registry.staging.resin.io
|
||||
|
||||
BUILDSTEP_VERSION = latest
|
||||
BUILDSTEP_VERSION = master
|
||||
|
||||
BUILDSTEP_REPO = resin/rpi-buildstep-armv6hf
|
||||
|
||||
@ -18,41 +14,51 @@ CACHE_VOLUME = # --volume /home/vagrant/cache:/cache
|
||||
all: supervisor
|
||||
|
||||
VERSIONED_IMAGES = "$(shell docker images --all | grep $(BUILDSTEP_VERSION) | awk '{print $$1}')"
|
||||
BUILDSTEP_PRESENT = $(shell echo $(VERSIONED_IMAGES) | grep --extended-regexp '$(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO)(\s|$$)' )
|
||||
BUILDSTEP_PRESENT = $(shell echo $(VERSIONED_IMAGES) | grep --extended-regexp '$(BUILDSTEP_REPO)(\s|$$)' )
|
||||
SUPERVISOR_BASE_PRESENT = $(shell echo $(VERSIONED_IMAGES) | grep --extended-regexp 'resin/supervisor-base(\s|$$)' )
|
||||
ACCELERATOR = $(shell docker ps --all | grep buildstep-accelerator-$(BUILDSTEP_VERSION) | awk '{print $$1}' )
|
||||
|
||||
clean:
|
||||
-docker rm -f build-supervisor-base 2> /dev/null || true
|
||||
-docker rmi resin/supervisor-base:latest
|
||||
-docker rmi resin/supervisor-base:$(BUILDSTEP_VERSION)
|
||||
-docker pull $(BUILDSTEP_REPO):$(BUILDSTEP_VERSION)
|
||||
-docker pull resin/rpi-buildstep-accelerator:$(BUILDSTEP_VERSION)
|
||||
ifneq ($(ACCELERATOR) , )
|
||||
-docker rm buildstep-accelerator-$(BUILDSTEP_VERSION) 2> /dev/null
|
||||
endif
|
||||
@echo "Older images cleaned - Fetched fresh buildstep and acccelerator"
|
||||
|
||||
supervisor-base:
|
||||
ifneq ($(BUILDSTEP_PRESENT) , )
|
||||
@echo "Using existing build step from $(BUILDSTEP_REPO):$(BUILDSTEP_VERSION)"
|
||||
else
|
||||
docker pull $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION)
|
||||
docker pull $(BUILDSTEP_REPO):$(BUILDSTEP_VERSION)
|
||||
endif
|
||||
ifneq ($(SUPERVISOR_BASE_PRESENT) , )
|
||||
@echo "Using existing supervisor base from resin/supervisor-base:$(BUILDSTEP_VERSION)"
|
||||
else
|
||||
docker rm -f build-supervisor-base 2> /dev/null || true
|
||||
docker run --name build-supervisor-base $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION) bash -c "apt-get -q update && apt-get install -qqy openvpn libsqlite3-dev socat && apt-get clean && rm -rf /var/lib/apt/lists/"
|
||||
docker run --name build-supervisor-base $(BUILDSTEP_REPO):$(BUILDSTEP_VERSION) bash -c "apt-get -q update && apt-get install -qqy openvpn libsqlite3-dev socat && apt-get clean && rm -rf /var/lib/apt/lists/"
|
||||
docker commit build-supervisor-base resin/supervisor-base:$(BUILDSTEP_VERSION)
|
||||
-docker rm build-supervisor-base 2> /dev/null
|
||||
endif
|
||||
docker tag resin/supervisor-base:$(BUILDSTEP_VERSION) resin/supervisor-base:latest
|
||||
|
||||
supervisor: supervisor-base
|
||||
docker build --no-cache=$(DISABLE_CACHE) -t $(IMAGE):$(SUPERVISOR_VERSION) .
|
||||
docker tag $(IMAGE):$(SUPERVISOR_VERSION) $(SUPERVISOR_REGISTRY)/$(IMAGE):$(SUPERVISOR_VERSION)
|
||||
|
||||
|
||||
ACCELERATOR = $(shell docker ps --all | grep buildstep-accelerator-$(BUILDSTEP_VERSION) | awk '{print $$1}' )
|
||||
|
||||
ifneq ($(ACCELERATOR) , )
|
||||
supervisor-accelerated: supervisor-base
|
||||
docker rm -f build-supervisor-latest 2> /dev/null || true
|
||||
docker run --name build-supervisor-latest $(CACHE_VOLUME) --volumes-from $(ACCELERATOR):ro -v `pwd`:/tmp/app resin/supervisor-base:latest bash -i -c ". /.env && cp -r /tmp/app /app && /build/builder"
|
||||
docker commit build-supervisor-latest $(IMAGE):$(SUPERVISOR_VERSION) > /dev/null
|
||||
docker tag $(IMAGE):$(SUPERVISOR_VERSION) $(SUPERVISOR_REGISTRY)/$(IMAGE):$(SUPERVISOR_VERSION)
|
||||
else
|
||||
supervisor-accelerated:
|
||||
@echo 'Please run make accelerator in resin-buildstep to continue'
|
||||
ifeq ($(ACCELERATOR) , )
|
||||
@echo 'Supervisor accelerator not found - Downloading resin/buildstep-accelerator and preparing.'
|
||||
-docker rm buildstep-accelerator-$(BUILDSTEP_VERSION) 2> /dev/null
|
||||
docker run --name=buildstep-accelerator-$(BUILDSTEP_VERSION) -v /.a resin/rpi-buildstep-accelerator:$(BUILDSTEP_VERSION) /prepare-accelerator.sh
|
||||
endif
|
||||
docker rm -f build-supervisor-latest 2> /dev/null || true
|
||||
docker run --name build-supervisor-latest $(CACHE_VOLUME) --volumes-from `docker ps --all | grep buildstep-accelerator-$(BUILDSTEP_VERSION) | awk '{print $$1}'`:ro -v `pwd`:/tmp/app resin/supervisor-base:latest bash -i -c ". /.env && cp -r /tmp/app /app && /build/builder"
|
||||
docker commit build-supervisor-latest $(IMAGE):$(SUPERVISOR_VERSION) > /dev/null
|
||||
-docker rm build-supervisor-latest 2> /dev/null
|
||||
|
||||
supervisor-x86_64:
|
||||
tar --exclude="Dockerfile" --transform='flags=r;s|Dockerfile.x86_64|Dockerfile|' -c . | docker build -t resin/x86_64-supervisor -
|
||||
|
Loading…
x
Reference in New Issue
Block a user