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

Merge pull request #191 from resin-io/188-use-docker-build-arg

Browse Source 
dind: use --parse-arg to change dropbear config during build-time
This commit is contained in:
Kostas Lekkas
2016-07-06 01:47:36 +03:00
committed by GitHub
parent c4f84e619f aff199f42f
commit 59cf4fd652
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -74,8 +74,7 @@ clean:
-rm Dockerfile -rm Dockerfile
supervisor-dind: supervisor-dind:
sed -i 's/\(ENV PASSWORDLESS_DROPBEAR\).*/\1 ${PASSWORDLESS_DROPBEAR}/' tools/dind/Dockerfile cd tools/dind && docker build $(DOCKER_HTTP_PROXY) $(DOCKER_HTTPS_PROXY) --no-cache=$(DISABLE_CACHE) --build-arg PASSWORDLESS_DROPBEAR=$(PASSWORDLESS_DROPBEAR) -t resin/resin-supervisor-dind:$(SUPERVISOR_VERSION) .
cd tools/dind && docker build $(DOCKER_HTTP_PROXY) $(DOCKER_HTTPS_PROXY) --no-cache=$(DISABLE_CACHE) -t resin/resin-supervisor-dind:$(SUPERVISOR_VERSION) .
run-supervisor: supervisor-dind stop-supervisor run-supervisor: supervisor-dind stop-supervisor
cd tools/dind \ cd tools/dind \

2
tools/dind/Dockerfile
View File

@ -14,7 +14,7 @@ ENV DOCKER_VERSION 1.10.3
ENV RELEASE_NAME jessie ENV RELEASE_NAME jessie
# Change to 'true' to allow blank password dropbear logins on dind HostOS # Change to 'true' to allow blank password dropbear logins on dind HostOS
ENV PASSWORDLESS_DROPBEAR false ARG PASSWORDLESS_DROPBEAR=false
COPY config/certs/ /usr/local/share/ca-certificates/ COPY config/certs/ /usr/local/share/ca-certificates/
RUN rm -f /usr/local/share/ca-certificates/.keepme ; update-ca-certificates RUN rm -f /usr/local/share/ca-certificates/.keepme ; update-ca-certificates