rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-05 19:16:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1021 from joshwget/remove-some-images

Browse Source 
Remove a few images
This commit is contained in:
Darren Shepherd 2016-06-16 14:59:06 -07:00 committed by GitHub
commit b6ddb4f577
6 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/02-acpid/Dockerfile
View File

@ -1,2 +0,0 @@
FROM rancher/os-base
CMD ["/usr/sbin/acpid", "-f"]

2
images/02-docker/Dockerfile
View File

@ -1,2 +0,0 @@
FROM rancher/os-base
CMD ["/usr/bin/user-docker"]

3
images/02-ntp/Dockerfile
View File

@ -1,3 +0,0 @@
FROM rancher/os-base
COPY ntp.sh /
CMD ["/ntp.sh"]

3
images/02-ntp/ntp.sh
View File

@ -1,3 +0,0 @@
#!/bin/bash
exec ntpd --nofork -g

2
images/02-state/Dockerfile
View File

@ -1,2 +0,0 @@
FROM rancher/os-base
CMD ["echo"]

24
os-config.tpl.yml
View File

@ -77,7 +77,8 @@ rancher:
services: services:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
acpid: acpid:
image: {{.OS_REPO}}/os-acpid:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: /usr/sbin/acpid -f
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
net: host net: host
@ -88,7 +89,8 @@ rancher:
- system-volumes - system-volumes
{{end -}} {{end -}}
all-volumes: all-volumes:
image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@ -130,7 +132,8 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
command-volumes: command-volumes:
image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@ -176,7 +179,8 @@ rancher:
- /media:/media:shared - /media:/media:shared
- /mnt:/mnt:shared - /mnt:/mnt:shared
container-data-volumes: container-data-volumes:
image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@ -214,7 +218,8 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
ntp: ntp:
image: {{.OS_REPO}}/os-ntp:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: ntpd --nofork -g
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: network-pre io.rancher.os.after: network-pre
@ -259,7 +264,8 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
system-volumes: system-volumes:
image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@ -308,7 +314,8 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
user-volumes: user-volumes:
image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: echo
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@ -320,7 +327,8 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
docker: docker:
image: {{.OS_REPO}}/os-docker:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
command: /usr/bin/user-docker
environment: environment:
- HTTP_PROXY - HTTP_PROXY
- HTTPS_PROXY - HTTPS_PROXY