Use the buildstep pushed to staging & Remove deploy_key

This commit is contained in:
Praneeth Bodduluri 2014-07-03 17:29:49 +02:00 committed by Pablo Carranza Vélez
parent 6fb20a5dc5
commit 53f3303abc
6 changed files with 28 additions and 5 deletions

View File

@ -1,3 +1,3 @@
FROM resin/rpi-buildstep:v0.0.7
FROM rpi-buildstep-armv6hf:latest
ADD . /app
RUN /build/builder

22
Makefile Normal file
View File

@ -0,0 +1,22 @@
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
all: supervisor
supervisor:
docker pull $(BUILDSTEP_REGISTRY)/resin/rpi-buildstep-armv6hf:$(BUILDSTEP_VERSION)
docker tag $(BUILDSTEP_REGISTRY)/resin/rpi-buildstep-armv6hf:$(BUILDSTEP_VERSION) rpi-buildstep-armv6hf:latest
docker build --no-cache=$(DISABLE_CACHE) -t $(IMAGE):$(SUPERVISOR_VERSION) .
docker tag $(IMAGE):$(SUPERVISOR_VERSION) $(SUPERVISOR_REGISTRY)/$(IMAGE):$(SUPERVISOR_VERSION)
.PHONY: supervisor

View File

@ -2,7 +2,7 @@
mkdir -p /root/.ssh
cp deploy_key /root/.ssh/id_rsa
chmod 400 /root/.ssh/id_rsa
cp known_hosts /root/.ssh/known_hosts
cp ssh_config /root/.ssh/config
# System dependencies
apt-get update

View File

@ -1,2 +0,0 @@
|1|wfrhZ0b5RA8AItMkrra9jXS0PI0=|AHvZSmF07fxeGv+Y2XKntSsiNis= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
|1|jyC7aM8m2KfHMTc5ev7Sie44osE=|F8HgXb4+jtHWMe9Q6ZUcmgHCN2w= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==

View File

@ -3,7 +3,7 @@
"version": "0.0.1",
"scripts": {
"preinstall": "bash deps.sh",
"postinstall": "node ./node_modules/coffee-script/bin/coffee -c ./src",
"postinstall": "node ./node_modules/coffee-script/bin/coffee -c ./src && rm -rf /root/.ssh/* && rm -rf /build/app/deploy_key",
"start": "./entry.sh"
},
"dependencies": {

3
ssh_config Normal file
View File

@ -0,0 +1,3 @@
Host bitbucket.org
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null