1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00

Update to docker-from-scratch-v1.10.3

DFS-1.10.3 supports SELinux
This commit is contained in:
Ivan Mikushin
2016-03-17 12:22:21 -07:00
parent 96c3f3958b
commit aae4d086c9
11 changed files with 24 additions and 33 deletions

View File

@@ -1,5 +1,5 @@
build:
image: rancher/dapper:1.10.2
image: rancher/dapper:1.10.3
volumes:
- /var/run/docker.sock:/var/run/docker.sock
commands:

View File

@@ -1,16 +1,23 @@
FROM golang:1.6
FROM ubuntu:16.04
RUN apt-get update && apt-get -y install libselinux-dev pkg-config
RUN wget -O /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \
RUN apt-get update && \
apt-get -y install locales sudo vim less curl wget git rsync build-essential isolinux xorriso gccgo \
libblkid-dev libmount-dev libselinux1-dev cpio genisoimage qemu-kvm python-pip ca-certificates pkg-config tox
RUN wget -O - https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz | tar -xz -C /usr/local
RUN wget -O /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 && \
chmod +x /usr/local/bin/docker
ENV PATH /usr/local/go/bin:$PATH
RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
ENV GOPATH /go
ENV PATH /go/bin:$PATH
ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-from-scratch
ENV DAPPER_OUTPUT ""
ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_ENV NO_TEST ARCH
ENV GO15VENDOREXPERIMENT 1
RUN mkdir -p ${DAPPER_SOURCE} && ln -s ${DAPPER_SOURCE} /source
WORKDIR ${DAPPER_SOURCE}
@@ -22,20 +29,16 @@ RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0
RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm.tar.gz
RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm64.tar.gz
RUN wget -O ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \
RUN wget -O ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 && \
chmod +x ./docker_amd64
RUN wget -O ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.2-arm2/docker-1.10.2_arm && \
RUN wget -O ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm && \
chmod +x ./docker_arm
RUN wget -O ./docker_arm64 -L https://github.com/rancher/docker/releases/download/v1.10.2-arm2/docker-1.10.2_arm64 && \
RUN wget -O ./docker_arm64 -L https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm64 && \
chmod +x ./docker_arm64
WORKDIR ${DAPPER_SOURCE}
COPY ./scripts/crosstools.list /etc/apt/sources.list.d/
RUN sh -c 'curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -' && \
dpkg --add-architecture armhf && dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64
COPY ./scripts/install-libs.sh /tmp/
RUN /tmp/install-libs.sh
CMD ./scripts/ci

View File

@@ -1,6 +0,0 @@
package selinux
// SetFileContext is a stub for SELinux support on ARM
func SetFileContext(path string, context string) (int, error) {
return 0, nil
}

View File

@@ -1,6 +0,0 @@
package selinux
// SetFileContext is a stub for SELinux support on ARM
func SetFileContext(path string, context string) (int, error) {
return 0, nil
}