rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-02 17:51:49 +00:00
Code Issues Releases Wiki Activity

update to DFS v1.10.2-1

Browse Source
This commit is contained in:
Ivan Mikushin 2016-03-08 17:54:57 -08:00
parent a557961c65
commit 5cc96f67a7
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.conf
View File

@ -1,6 +1,6 @@
IMAGE_NAME=rancher/os IMAGE_NAME=rancher/os
VERSION=v0.4.4-dev VERSION=v0.4.4-dev
DFS_IMAGE=rancher/docker:v1.10.2 DFS_IMAGE=rancher/docker:v1.10.2-1
SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.1/policy.29 SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.1/policy.29
HOSTNAME_DEFAULT=rancher HOSTNAME_DEFAULT=rancher

2
trash.yml
View File

@ -66,7 +66,7 @@ import:
version: 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67 version: 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67
- package: github.com/rancher/docker-from-scratch - package: github.com/rancher/docker-from-scratch
version: v1.10.2 version: v1.10.2-1
- package: github.com/rancher/netconf - package: github.com/rancher/netconf
version: d7d620ef4ea62a9d04b51c7b3d9dc83fe7ffaa1b version: d7d620ef4ea62a9d04b51c7b3d9dc83fe7ffaa1b

2
vendor/github.com/rancher/docker-from-scratch/.drone.yml generated vendored
View File

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

21
vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper generated vendored
View File

@ -1,13 +1,13 @@
FROM golang:1.5.3 FROM golang:1.6
RUN apt-get update && apt-get -y install libselinux-dev pkg-config RUN apt-get update && apt-get -y install libselinux-dev pkg-config
RUN curl -o /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 && \ RUN wget -O /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \
chmod +x /usr/local/bin/docker chmod +x /usr/local/bin/docker
ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-from-scratch ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-from-scratch
ENV DAPPER_OUTPUT "" ENV DAPPER_OUTPUT ""
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_ENV NO_TEST ENV DAPPER_ENV NO_TEST ARCH
ENV GO15VENDOREXPERIMENT 1 ENV GO15VENDOREXPERIMENT 1
@ -18,21 +18,24 @@ WORKDIR ${DAPPER_SOURCE}
RUN mkdir -p assets RUN mkdir -p assets
WORKDIR ${DAPPER_SOURCE}/assets WORKDIR ${DAPPER_SOURCE}/assets
RUN curl -OL https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.3.1/base-files_amd64.tar.gz RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_amd64.tar.gz
RUN curl -OL https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.3.1/base-files_arm.tar.gz 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 curl -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.2 && \
chmod +x ./docker_amd64 chmod +x ./docker_amd64
RUN curl -o ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.2-ros_arm/docker-1.10.2 && \ RUN wget -O ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.2-arm2/docker-1.10.2_arm && \
chmod +x ./docker_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 && \
chmod +x ./docker_arm64
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}
COPY ./scripts/crosstools.list /etc/apt/sources.list.d/ 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 -' && \ RUN sh -c 'curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -' && \
dpkg --add-architecture armhf && \ dpkg --add-architecture armhf && dpkg --add-architecture arm64 && \
apt-get update && \ apt-get update && \
apt-get install -y crossbuild-essential-armhf apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64
CMD ./scripts/ci CMD ./scripts/ci

2
vendor/github.com/rancher/docker-from-scratch/scratch.go generated vendored
View File

@ -453,7 +453,7 @@ func touchSockets(args ...string) error {
} }
func createLayout(config *Config) error { func createLayout(config *Config) error {
if err := createDirs("/tmp", "/root/.ssh", "/var"); err != nil { if err := createDirs("/tmp", "/root/.ssh", "/var", "/usr/lib"); err != nil {
return err return err
} }

6
vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm64.go generated vendored Normal file
View File

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