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

Docker 1.11.1

Browse Source
This commit is contained in:
Darren Shepherd
2016-05-31 21:38:10 -07:00
parent 43f90b8e61
commit 8ab32c820f
16 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Dockerfile.dapper
View File

@@ -47,16 +47,16 @@ ARG OS_REPO=rancher
ARG HOSTNAME_DEFAULT=rancher ARG HOSTNAME_DEFAULT=rancher
ARG DISTRIB_ID=RancherOS ARG DISTRIB_ID=RancherOS
ARG DOCKER_VERSION=1.10.3 ARG DOCKER_VERSION=1.11.1
ARG DOCKER_PATCH_VERSION=v${DOCKER_VERSION}-ros1 ARG DOCKER_PATCH_VERSION=v${DOCKER_VERSION}-ros2
ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.2/policy.29 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.2/policy.29
ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-34.39-rancher/linux-4.2.8-ckt4-rancher-x86.tar.gz ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-23.41-rancher/linux-4.4.10-rancher-x86.tar.gz
ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64-3/linux-4.1.18-arm64.tar.gz ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64-3/linux-4.1.18-arm64.tar.gz
ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz
ARG DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm ARG DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm.tgz
ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64 ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64.tgz
ARG TOOLCHAIN_arm64=aarch64-linux-gnu ARG TOOLCHAIN_arm64=aarch64-linux-gnu
ARG TOOLCHAIN_arm=arm-linux-gnueabihf ARG TOOLCHAIN_arm=arm-linux-gnueabihf
@@ -115,14 +115,14 @@ RUN ln -sf go-6 /usr/bin/go && \
ENV GOPATH /go ENV GOPATH /go
ENV PATH ${GOPATH}/bin:/usr/local/go/bin:$PATH ENV PATH ${GOPATH}/bin:/usr/local/go/bin:$PATH
# Install Docker # Install Host Docker
RUN URL=DOCKER_URL_${HOST_ARCH} && \ RUN URL=DOCKER_URL_${HOST_ARCH} && \
curl -fL ${!URL} > /usr/bin/docker && \ curl -fL ${!URL} | tar xzf - --strip-components=1 -C /usr/bin docker/docker && \
chmod +x /usr/bin/docker chmod +x /usr/bin/docker
# Install Docker # Install Target Docker
RUN curl -fL ${!DOCKER_URL} > ${DOWNLOADS}/docker && \ RUN curl -fL ${!DOCKER_URL} > ${DOWNLOADS}/docker.tgz
chmod +x ${DOWNLOADS}/docker
# Install Trash # Install Trash
RUN go get github.com/rancher/trash RUN go get github.com/rancher/trash

21
cmd/systemdocker/system-docker.go
View File

@@ -1,30 +1,21 @@
package systemdocker package systemdocker
import ( import (
"log"
"os" "os"
"strings"
"syscall"
log "github.com/Sirupsen/logrus" "github.com/docker/docker/docker"
"github.com/rancher/os/config" "github.com/rancher/os/config"
) )
func Main() { func Main() {
var newEnv []string
for _, env := range os.Environ() {
if !strings.HasPrefix(env, "DOCKER_HOST=") {
newEnv = append(newEnv, env)
}
}
newEnv = append(newEnv, "DOCKER_HOST="+config.DOCKER_SYSTEM_HOST)
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
log.Fatalf("%s: Need to be root", os.Args[0]) log.Fatalf("%s: Need to be root", os.Args[0])
} }
os.Args[0] = config.DOCKER_DIST_BIN if os.Getenv("DOCKER_HOST") == "" {
if err := syscall.Exec(os.Args[0], os.Args, newEnv); err != nil { os.Setenv("DOCKER_HOST", config.DOCKER_SYSTEM_HOST)
log.Fatal(err)
} }
docker.Main()
} }

1
config/types.go
View File

@@ -23,6 +23,7 @@ const (
MODULES_ARCHIVE = "/modules.tar" MODULES_ARCHIVE = "/modules.tar"
DEBUG = false DEBUG = false
SYSTEM_DOCKER_LOG = "/var/log/system-docker.log" SYSTEM_DOCKER_LOG = "/var/log/system-docker.log"
SYSTEM_DOCKER_BIN = "/usr/bin/system-docker"
LABEL = "label" LABEL = "label"
HASH = "io.rancher.os.hash" HASH = "io.rancher.os.hash"

5
images/02-console/Dockerfile
View File

@@ -8,6 +8,9 @@ RUN sed -i 's/rancher:!/rancher:*/g' /etc/shadow && \
echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
echo '## allow password less for docker user' >> /etc/sudoers && \ echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
ln -sf /usr/bin/docker.dist /usr/bin/docker ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
COPY prompt.sh /etc/profile.d/ COPY prompt.sh /etc/profile.d/
CMD ["/usr/sbin/console.sh"] CMD ["/usr/sbin/console.sh"]

5
images/02-preload/Dockerfile
View File

@@ -1,4 +1,7 @@
FROM rancher/os-base FROM rancher/os-base
RUN ln -sf /usr/bin/docker.dist /usr/bin/docker RUN ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
COPY preload.sh / COPY preload.sh /
CMD ["/preload.sh"] CMD ["/preload.sh"]

5
images/10-centosconsole/Dockerfile
View File

@@ -16,7 +16,10 @@ RUN groupadd --gid 1100 rancher && \
echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
echo '## allow password less for docker user' >> /etc/sudoers && \ echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
ln -sf /usr/bin/docker.dist /usr/bin/docker ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
COPY prompt.sh /etc/profile.d/ COPY prompt.sh /etc/profile.d/
ENTRYPOINT ["/usr/sbin/entry.sh"] ENTRYPOINT ["/usr/sbin/entry.sh"]
CMD ["/usr/sbin/console.sh"] CMD ["/usr/sbin/console.sh"]

5
images/10-debianconsole/Dockerfile
View File

@@ -16,6 +16,9 @@ RUN addgroup --gid 1100 rancher && \
echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
echo '## allow password less for docker user' >> /etc/sudoers && \ echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
ln -sf /usr/bin/docker.dist /usr/bin/docker ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
ENTRYPOINT ["/usr/sbin/entry.sh"] ENTRYPOINT ["/usr/sbin/entry.sh"]
CMD ["/usr/sbin/console.sh"] CMD ["/usr/sbin/console.sh"]

5
images/10-fedoraconsole/Dockerfile
View File

@@ -16,7 +16,10 @@ RUN groupadd --gid 1100 rancher && \
echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
echo '## allow password less for docker user' >> /etc/sudoers && \ echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
ln -sf /usr/bin/docker.dist /usr/bin/docker ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
COPY prompt.sh /etc/profile.d/ COPY prompt.sh /etc/profile.d/
ENTRYPOINT ["/usr/sbin/entry.sh"] ENTRYPOINT ["/usr/sbin/entry.sh"]
CMD ["/usr/sbin/console.sh"] CMD ["/usr/sbin/console.sh"]

5
images/10-ubuntuconsole/Dockerfile
View File

@@ -16,6 +16,9 @@ RUN addgroup --gid 1100 rancher && \
echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'rancher ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
echo '## allow password less for docker user' >> /etc/sudoers && \ echo '## allow password less for docker user' >> /etc/sudoers && \
echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \
ln -sf /usr/bin/docker.dist /usr/bin/docker ln -sf /usr/bin/docker.dist /usr/bin/docker && \
ln -sf /usr/bin/docker-containerd.dist /usr/bin/docker-containerd && \
ln -sf /usr/bin/docker-containerd-shim.dist /usr/bin/docker-containerd-shim && \
ln -sf /usr/bin/docker-runc.dist /usr/bin/docker-runc
ENTRYPOINT ["/usr/sbin/entry.sh"] ENTRYPOINT ["/usr/sbin/entry.sh"]
CMD ["/usr/sbin/console.sh"] CMD ["/usr/sbin/console.sh"]

3
init/bootstrap.go
View File

@@ -33,13 +33,12 @@ func runBootstrapContainers(cfg *config.CloudConfig) (*config.CloudConfig, error
} }
func startDocker(cfg *config.CloudConfig) (chan interface{}, error) { func startDocker(cfg *config.CloudConfig) (chan interface{}, error) {
launchConfig, args := getLaunchConfig(cfg, &cfg.Rancher.BootstrapDocker) launchConfig, args := getLaunchConfig(cfg, &cfg.Rancher.BootstrapDocker)
launchConfig.Fork = true launchConfig.Fork = true
launchConfig.LogFile = "" launchConfig.LogFile = ""
launchConfig.NoLog = true launchConfig.NoLog = true
cmd, err := dockerlaunch.LaunchDocker(launchConfig, config.DOCKER_BIN, args...) cmd, err := dockerlaunch.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
init/init.go
View File

@@ -230,7 +230,7 @@ func RunInit() error {
launchConfig.Fork = !cfg.Rancher.SystemDocker.Exec launchConfig.Fork = !cfg.Rancher.SystemDocker.Exec
log.Info("Launching System Docker") log.Info("Launching System Docker")
_, err = dockerlaunch.LaunchDocker(launchConfig, config.DOCKER_BIN, args...) _, err = dockerlaunch.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
if err != nil { if err != nil {
return err return err
} }

59
main.go
View File

@@ -1,10 +1,7 @@
package main package main
import ( import (
"os" "github.com/docker/docker/docker"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/rancher/docker-from-scratch" "github.com/rancher/docker-from-scratch"
"github.com/rancher/os/cmd/cloudinit" "github.com/rancher/os/cmd/cloudinit"
@@ -16,48 +13,32 @@ import (
"github.com/rancher/os/cmd/systemdocker" "github.com/rancher/os/cmd/systemdocker"
"github.com/rancher/os/cmd/userdocker" "github.com/rancher/os/cmd/userdocker"
"github.com/rancher/os/cmd/wait" "github.com/rancher/os/cmd/wait"
"github.com/rancher/os/config"
osInit "github.com/rancher/os/init" osInit "github.com/rancher/os/init"
) )
func registerCmd(cmd string, mainFunc func()) { var entrypoints = map[string]func(){
log.Debugf("Registering main %s", cmd) "cloud-init": cloudinit.Main,
reexec.Register(cmd, mainFunc) "docker": docker.Main,
"dockerlaunch": dockerlaunch.Main,
parts := strings.Split(cmd, "/") "halt": power.Halt,
if len(parts) == 0 { "init": osInit.MainInit,
return "netconf": network.Main,
} "poweroff": power.PowerOff,
"reboot": power.Reboot,
last := parts[len(parts)-1] "respawn": respawn.Main,
"ros-sysinit": sysinit.Main,
log.Debugf("Registering main %s", last) "shutdown": power.Main,
reexec.Register(last, mainFunc) "system-docker": systemdocker.Main,
"user-docker": userdocker.Main,
log.Debugf("Registering main %s", "./"+last) "wait-for-docker": wait.Main,
reexec.Register("./"+last, mainFunc)
} }
func main() { func main() {
registerCmd("/init", osInit.MainInit) for name, f := range entrypoints {
registerCmd(config.SYSINIT_BIN, sysinit.Main) reexec.Register(name, f)
registerCmd("/usr/bin/dockerlaunch", dockerlaunch.Main) }
registerCmd("/usr/bin/user-docker", userdocker.Main)
registerCmd("/usr/bin/system-docker", systemdocker.Main)
registerCmd("/sbin/poweroff", power.PowerOff)
registerCmd("/sbin/reboot", power.Reboot)
registerCmd("/sbin/halt", power.Halt)
registerCmd("/sbin/shutdown", power.Main)
registerCmd("/usr/bin/respawn", respawn.Main)
registerCmd("/usr/bin/ros", control.Main)
registerCmd("/usr/bin/cloud-init", cloudinit.Main)
registerCmd("/usr/sbin/netconf", network.Main)
registerCmd("/usr/sbin/wait-for-docker", wait.Main)
if !reexec.Init() { if !reexec.Init() {
reexec.Register(os.Args[0], control.Main) control.Main()
if !reexec.Init() {
log.Fatalf("Failed to find an entry point for %s", os.Args[0])
}
} }
} }

4
os-config.tpl.yml
View File

@@ -138,6 +138,9 @@ rancher:
privileged: true privileged: true
read_only: true read_only: true
volumes: volumes:
- /usr/bin/docker-containerd:/usr/bin/docker-containerd.dist:ro
- /usr/bin/docker-containerd-shim:/usr/bin/docker-containerd-shim.dist:ro
- /usr/bin/docker-runc:/usr/bin/docker-runc.dist:ro
- /usr/bin/docker:/usr/bin/docker.dist:ro - /usr/bin/docker:/usr/bin/docker.dist:ro
- /usr/bin/ros:/usr/bin/dockerlaunch:ro - /usr/bin/ros:/usr/bin/dockerlaunch:ro
- /usr/bin/ros:/usr/bin/user-docker:ro - /usr/bin/ros:/usr/bin/user-docker:ro
@@ -328,6 +331,7 @@ rancher:
volumes: volumes:
- /sys/fs/cgroup:/host/sys/fs/cgroup - /sys/fs/cgroup:/host/sys/fs/cgroup
system_docker: system_docker:
exec: true
args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -b, docker-sys, args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -b, docker-sys,
--fixed-cidr, 172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root, --fixed-cidr, 172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root,
-H, 'unix:///var/run/system-docker.sock', --userland-proxy=false] -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]

4
scripts/build-target
View File

@@ -14,5 +14,7 @@ fi
OUTPUT=${OUTPUT:-bin/ros} OUTPUT=${OUTPUT:-bin/ros}
echo Building $OUTPUT echo Building $OUTPUT
go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "-X github.com/rancher/os/config.VERSION=${VERSION} -linkmode external -extldflags -static" -o ${OUTPUT}
CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION}"
go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT}
strip --strip-all ${OUTPUT} strip --strip-all ${OUTPUT}

3
scripts/layout
View File

@@ -17,11 +17,12 @@ mkdir -p ${INITRD_DIR}/usr/{etc,bin,share/ros}
cp -rf assets/selinux ${INITRD_DIR}/usr/etc cp -rf assets/selinux ${INITRD_DIR}/usr/etc
cp build/images.tar ${INITRD_DIR}/usr/share/ros/ cp build/images.tar ${INITRD_DIR}/usr/share/ros/
cp bin/ros ${INITRD_DIR}/usr/bin/ cp bin/ros ${INITRD_DIR}/usr/bin/
cp ${DOWNLOADS}/docker ${INITRD_DIR}/usr/bin/docker
ln -s usr/bin/ros ${INITRD_DIR}/init ln -s usr/bin/ros ${INITRD_DIR}/init
ln -s bin ${INITRD_DIR}/usr/sbin ln -s bin ${INITRD_DIR}/usr/sbin
ln -s usr/sbin ${INITRD_DIR}/sbin ln -s usr/sbin ${INITRD_DIR}/sbin
ln -s ros ${INITRD_DIR}/usr/bin/system-docker
tar xvzf ${DOWNLOADS}/docker.tgz -C ${INITRD_DIR}/usr/bin --strip-components=1
if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
mkdir -p ${BUILD}/kernel mkdir -p ${BUILD}/kernel

4
scripts/package-rootfs
View File

@@ -16,8 +16,8 @@ DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(unam
trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT
docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar
docker stop ${DFS} docker stop ${DFS}
docker run --rm --volumes-from=${DFS} rancher/os-dapper-base tar -c -C /var/lib/docker ./image | tar -x -C ${PREPOP_DIR} docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./image | tar -x -C ${PREPOP_DIR}
docker run --rm --volumes-from=${DFS} rancher/os-dapper-base tar -c -C /var/lib/docker ./overlay | tar -x -C ${PREPOP_DIR} docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./overlay | tar -x -C ${PREPOP_DIR}
tar -cf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} . tar -cf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
tar -rf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} . tar -rf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .