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

Append to /var/log/docker.log and /var/log/system-docker.log

Browse Source
This commit is contained in:
Darren Shepherd 2016-06-06 22:59:30 -07:00
parent c8fd1bc665
commit 90224d5fcd
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/02-console/docker-init
View File

@ -19,4 +19,4 @@ for i in /opt/bin /usr/local/bin; do
fi fi
done done
exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >/var/log/docker.log 2>&1 exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >>/var/log/docker.log 2>&1

2
trash.conf
View File

@ -33,7 +33,7 @@ github.com/opencontainers/runtime-spec f955d90e70a98ddfb886bd930ffd076da9b67998
github.com/opencontainers/specs f955d90e70a98ddfb886bd930ffd076da9b67998 github.com/opencontainers/specs f955d90e70a98ddfb886bd930ffd076da9b67998
github.com/packethost/packngo 92012705236896736875186c9e49557897c6af90 https://github.com/ibuildthecloud/packngo.git github.com/packethost/packngo 92012705236896736875186c9e49557897c6af90 https://github.com/ibuildthecloud/packngo.git
github.com/pmezard/go-difflib d8ed2627bdf02c080bf22230dbb337003b7aba2d github.com/pmezard/go-difflib d8ed2627bdf02c080bf22230dbb337003b7aba2d
github.com/rancher/docker-from-scratch v1.10.3 github.com/rancher/docker-from-scratch 2a4ea96a0a45eac0127049a3a96b60270d0f0a8b
github.com/rancher/netconf ddd7e35a6aacd7e80991920774083dd4408ec018 github.com/rancher/netconf ddd7e35a6aacd7e80991920774083dd4408ec018
github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43 github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43
github.com/ryanuber/go-glob 0067a9abd927e50aed5190662702f81231413ae0 github.com/ryanuber/go-glob 0067a9abd927e50aed5190662702f81231413ae0

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

@ -2,7 +2,7 @@ FROM scratch
ADD build/base-files.tar.gz / ADD build/base-files.tar.gz /
COPY build/ca-certificates.crt /usr/etc/ssl/certs/ COPY build/ca-certificates.crt /usr/etc/ssl/certs/
COPY build/dockerlaunch /usr/bin/ COPY build/dockerlaunch /usr/bin/
COPY build/docker /usr/bin/docker COPY build/docker* /usr/bin/
VOLUME /var/lib/docker VOLUME /var/lib/docker
ENTRYPOINT ["/usr/bin/dockerlaunch", "/usr/bin/docker"] ENTRYPOINT ["/usr/bin/dockerlaunch", "/usr/bin/docker"]
CMD ["daemon", "-s", "overlay"] CMD ["daemon", "-s", "overlay"]

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

@ -4,7 +4,7 @@ RUN apt-get update && \
apt-get -y install locales sudo vim less curl wget git rsync build-essential isolinux xorriso gccgo \ 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 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 - https://storage.googleapis.com/golang/go1.6.2.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 && \ 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 chmod +x /usr/local/bin/docker
@ -18,23 +18,18 @@ ENV DAPPER_OUTPUT ""
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_ENV NO_TEST ARCH ENV DAPPER_ENV NO_TEST ARCH
RUN mkdir -p ${DAPPER_SOURCE} && ln -s ${DAPPER_SOURCE} /source RUN mkdir -p ${DAPPER_SOURCE}/assets && ln -s ${DAPPER_SOURCE} /source
WORKDIR ${DAPPER_SOURCE}
RUN mkdir -p assets
WORKDIR ${DAPPER_SOURCE}/assets WORKDIR ${DAPPER_SOURCE}/assets
RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_amd64.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 wget -O ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 && \ RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_amd64.tar.gz && \
chmod +x ./docker_amd64 wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm.tar.gz && \
RUN wget -O ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm && \ wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm64.tar.gz
chmod +x ./docker_arm
RUN wget -O ./docker_arm64 -L https://github.com/rancher/docker/releases/download/v1.10.3-arm/docker-1.10.3_arm64 && \ ENV DOCKER_VERSION=1.11.1 DOCKER_PATCH_VERSION=v1.11.1-ros4
chmod +x ./docker_arm64 RUN wget -O docker-${DOCKER_VERSION}_amd64.tgz -L https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
wget -L https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm.tgz && \
wget -L https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64.tgz
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}

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

@ -595,7 +595,7 @@ func setupLogging(config *Config) error {
return err return err
} }
output, err := os.Create(config.LogFile) output, err := os.OpenFile(config.LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil { if err != nil {
return err return err
} }