зеркало из https://github.com/microsoft/docker.git
don't skip cert check for an example & use HTTPS
This changes two URLs from http to https and it fixes a Dockerfile to stop skipping certificate validation. It also adds the ca-certificates package to that Dockerfile example. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
Родитель
16c2031137
Коммит
73a277eb2f
|
@ -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
|
||||||
|
|
|
@ -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,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.
|
||||||
|
|
||||||
=================
|
=================
|
||||||
|
|
Загрузка…
Ссылка в новой задаче