kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #4248 from unclejack/https_fixes

Browse source 
don't skip cert check for an example & use HTTPS
This commit is contained in:
James Turnbull 2014-02-21 10:47:44 -05:00
commit ea9dd4ca59
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/mkimage-arch.sh
View file

@ -39,7 +39,7 @@ arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill havege
arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime" arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen
arch-chroot $ROOTFS locale-gen arch-chroot $ROOTFS locale-gen
arch-chroot $ROOTFS /bin/sh -c 'echo "Server = http://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist' arch-chroot $ROOTFS /bin/sh -c 'echo "Server = https://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'
# udev doesn't work in containers, rebuild /dev # udev doesn't work in containers, rebuild /dev
DEV=$ROOTFS/dev DEV=$ROOTFS/dev

4
docs/sources/examples/cfengine_process_management.rst
View file

@ -55,7 +55,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
FROM ubuntu FROM ubuntu
MAINTAINER Eystein Måløy Stenberg <eytein.stenberg@gmail.com> MAINTAINER Eystein Måløy Stenberg <eytein.stenberg@gmail.com>
RUN apt-get -y install wget lsb-release unzip RUN apt-get -y install wget lsb-release unzip ca-certificates
# install latest CFEngine # install latest CFEngine
RUN wget -qO- http://cfengine.com/pub/gpg.key | apt-key add - RUN wget -qO- http://cfengine.com/pub/gpg.key | apt-key add -
@ -64,7 +64,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
RUN apt-get install cfengine-community RUN apt-get install cfengine-community
# install cfe-docker process management policy # install cfe-docker process management policy
RUN wget --no-check-certificate https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/ RUN wget https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/
RUN cp /tmp/cfe-docker-master/cfengine/bin/* /var/cfengine/bin/ RUN cp /tmp/cfe-docker-master/cfengine/bin/* /var/cfengine/bin/
RUN cp /tmp/cfe-docker-master/cfengine/inputs/* /var/cfengine/inputs/ RUN cp /tmp/cfe-docker-master/cfengine/inputs/* /var/cfengine/inputs/
RUN rm -rf /tmp/cfe-docker-master /tmp/master.zip RUN rm -rf /tmp/cfe-docker-master /tmp/master.zip

2
docs/sources/reference/api/docker_remote_api.rst
View file

@ -2,7 +2,7 @@
:description: API Documentation for Docker :description: API Documentation for Docker
:keywords: API, Docker, rcli, REST, documentation :keywords: API, Docker, rcli, REST, documentation
.. COMMENT use http://pythonhosted.org/sphinxcontrib-httpdomain/ to .. COMMENT use https://pythonhosted.org/sphinxcontrib-httpdomain/ to
.. document the REST API. .. document the REST API.
================= =================