1. docker
  2. Commit 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Browse code

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)

unclejack authored on 2014/02/20 08:11:04
Showing 3 changed files
contrib/mkimage-arch.sh
History View file @ 73a277e
... ... 
@@ -39,7 +39,7 @@ arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill havege
39 39 
 arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
40 40 
 echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen
41 41 
 arch-chroot $ROOTFS locale-gen
42 
-arch-chroot $ROOTFS /bin/sh -c 'echo "Server = http://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'
42 
+arch-chroot $ROOTFS /bin/sh -c 'echo "Server = https://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'
43 43
44 44 
 # udev doesn't work in containers, rebuild /dev
45 45 
 DEV=$ROOTFS/dev
docs/sources/examples/cfengine_process_management.rst
History View file @ 73a277e
... ... 
@@ -55,7 +55,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
55 55 
     FROM ubuntu
56 56 
     MAINTAINER Eystein Måløy Stenberg <eytein.stenberg@gmail.com>
57 57
58 
-    RUN apt-get -y install wget lsb-release unzip
58 
+    RUN apt-get -y install wget lsb-release unzip ca-certificates
59 59
60 60 
     # install latest CFEngine
61 61 
     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.
64 64 
     RUN apt-get install cfengine-community
65 65
66 66 
     # install cfe-docker process management policy
67 
-    RUN wget --no-check-certificate https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/
67 
+    RUN wget https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/
68 68 
     RUN cp /tmp/cfe-docker-master/cfengine/bin/* /var/cfengine/bin/
69 69 
     RUN cp /tmp/cfe-docker-master/cfengine/inputs/* /var/cfengine/inputs/
70 70 
     RUN rm -rf /tmp/cfe-docker-master /tmp/master.zip
docs/sources/reference/api/docker_remote_api.rst
History View file @ 73a277e
... ... 
@@ -2,7 +2,7 @@
2 2 
 :description: API Documentation for Docker
3 3 
 :keywords: API, Docker, rcli, REST, documentation
4 4
5 
-.. COMMENT use http://pythonhosted.org/sphinxcontrib-httpdomain/ to
5 
+.. COMMENT use https://pythonhosted.org/sphinxcontrib-httpdomain/ to
6 6 
 .. document the REST API.
7 7
8 8 
 =================