Revert "Switch to docker-ce repository"
This reverts commit cf05d875b2f39155acd5ec6b73804093feaf7bf4.
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index db97d14..217d405 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -3,12 +3,12 @@
server:
mirror:
docker-trusty:
- source: 'https://download.docker.com/linux/ubuntu'
- distribution: trusty
- components: stable
+ source: https://apt.dockerproject.org/repo
+ distribution: ubuntu-trusty
+ components: main
architectures: amd64
gpgkeys:
- - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+ - 58118E89F3A912897C070ADBF76221572C52609D
publisher:
component: docker
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index b5d98c5..4334374 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -1,14 +1,16 @@
parameters:
+ _param:
+ apt_mk_version: stable
aptly:
server:
mirror:
docker-xenial:
- source: 'https://download.docker.com/linux/ubuntu'
- distribution: xenial
- components: stable
+ source: https://apt.dockerproject.org/repo
+ distribution: ubuntu-xenial
+ components: main
architectures: amd64
gpgkeys:
- - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+ - 58118E89F3A912897C070ADBF76221572C52609D
publisher:
component: docker
distributions:
diff --git a/docker/host.yml b/docker/host.yml
index 853a5d2..f7649b5 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -4,9 +4,6 @@
parameters:
docker:
host:
- pkgs:
- - docker-ce
- - python-docker
experimental: true
insecure_registries:
- ${_param:cluster_vip_address}:5000
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index c8c6b64..bc01e92 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.73
+ docker_image_jenkins: tcpcloud/jenkins:2.71
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
docker:
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index b6bab31..99e230b 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -23,8 +23,8 @@
tags: "2.32"
dockerfile: "Dockerfile"
- name: jenkins
- branch: "2.73"
- tags: "2.73 latest"
+ branch: "2.71"
+ tags: "2.71 latest"
dockerfile: "Dockerfile"
- name: phpldapadmin
branch: "master"
diff --git a/linux/system/repo/docker.yml b/linux/system/repo/docker.yml
index a3ee559..c527aa8 100644
--- a/linux/system/repo/docker.yml
+++ b/linux/system/repo/docker.yml
@@ -3,6 +3,7 @@
system:
repo:
docker:
- source: 'deb [arch=amd64] https://download.docker.com/linux/${_param:linux_distrib_codename}/ ${_param:linux_system_codename} stable'
+ source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main"
architectures: amd64
- key_url: https://download.docker.com/linux/${_param:linux_distrib_codename}/gpg
+ key_id: 58118E89F3A912897C070ADBF76221572C52609D
+ key_server: keyserver.ubuntu.com