rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-13 13:39:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master

Browse Source 
Conflicts:
	config/default.go
This commit is contained in:
Darren Shepherd
2015-02-19 11:32:09 -07:00
parent 045130a830 fb237dbebe
commit 325cbc2fe7
13 changed files with 479 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/dockerimages/05-userdocker Normal file
View File

@@ -0,0 +1,4 @@
FROM base
COPY scripts/dockerimages/scripts/docker.sh /
COPY assets/ca.crt /etc/ssl/certs/ca-certificates.crt
CMD ["/docker.sh"]