You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2020/01/13 15:12:19 UTC
[couchdb-infra-cm] 01/02: Rework Docker for ppc64le support
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-infra-cm.git
commit 17a0c3cca88e366117da6bd6339558e6688f910a
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Jan 13 09:11:19 2020 -0600
Rework Docker for ppc64le support
---
roles/ci_agent/tasks/docker.yml | 54 --------------------------------------
roles/ci_agent/tasks/main.yml | 58 +++++++++++++++++++++++++++++++++++++----
2 files changed, 53 insertions(+), 59 deletions(-)
diff --git a/roles/ci_agent/tasks/docker.yml b/roles/ci_agent/tasks/docker.yml
deleted file mode 100644
index a63f71f..0000000
--- a/roles/ci_agent/tasks/docker.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- name: Install Docker gpg key for Apt
- apt_key:
- url: https://download.docker.com/linux/debian/gpg
- state: present
-
-- name: Setup Docker Apt repository
- apt_repository:
- repo: deb https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable
- filename: docker
- state: present
-
-- name: Install Docker Packages
- apt:
- name: "{{ packages }}"
- vars:
- packages:
- - containerd.io
- - docker-ce
- - docker-ce-cli
-
-- name: Install multi-architecture support for Docker
- apt:
- name: "{{ packages }}"
- state: latest
- vars:
- packages:
- - binfmt-support
- - qemu
- - qemu-user-static
-
-- name: Install kill-old-docker.sh
- copy:
- src: kill-old-docker.sh
- dest: /usr/local/bin/kill-old-docker.sh
- mode: 0755
-
-- name: Add kill-old-docker.sh cron entry
- cron:
- name: Kill old docker containers
- hour: '19'
- job: /usr/local/bin/kill-old-docker.sh
-
-- name: Add docker prune cron entry
- cron:
- name: Docker prune
- hour: '19'
- job: /usr/bin/docker system prune -a -f --filter "until=72h"
-
-- name: Add Jenkins user to docker group
- user:
- name: jenkins
- groups:
- - docker
- append: yes
\ No newline at end of file
diff --git a/roles/ci_agent/tasks/main.yml b/roles/ci_agent/tasks/main.yml
index 2f97ab8..6dba9f5 100644
--- a/roles/ci_agent/tasks/main.yml
+++ b/roles/ci_agent/tasks/main.yml
@@ -17,6 +17,58 @@
packages:
- openjdk-8-jre-headless
+- name: Install Docker gpg key for Apt
+ apt_key:
+ url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg
+ state: present
+
+- name: Setup Docker Apt repository
+ apt_repository:
+ repo: deb https://download.docker.com/linux/{{ansible_distribution | lower}} {{ ansible_distribution_release }} stable
+ filename: docker
+ state: present
+
+- name: Install Docker Packages
+ apt:
+ name: "{{ packages }}"
+ vars:
+ packages:
+ - containerd.io
+ - docker-ce
+
+- name: Install Docker CLI Package on Debian
+ apt:
+ name: docker-ce-cli
+ when: ansible_distribution == 'Debian'
+
+- name: Install multi-architecture support for Docker
+ apt:
+ name: "{{ packages }}"
+ state: latest
+ vars:
+ packages:
+ - binfmt-support
+ - qemu
+ - qemu-user-static
+
+- name: Install kill-old-docker.sh
+ copy:
+ src: kill-old-docker.sh
+ dest: /usr/local/bin/kill-old-docker.sh
+ mode: 0755
+
+- name: Add kill-old-docker.sh cron entry
+ cron:
+ name: Kill old docker containers
+ hour: '19'
+ job: /usr/local/bin/kill-old-docker.sh
+
+- name: Add docker prune cron entry
+ cron:
+ name: Docker prune
+ hour: '19'
+ job: /usr/bin/docker system prune -a -f --filter "until=72h"
+
- name: Add group jenkins
group:
name: jenkins
@@ -28,14 +80,10 @@
uid: 910
groups:
- jenkins
+ - docker
state: present
shell: /bin/bash
-- name: Setup Docker on x86_64 hosts
- include_tasks: docker.yml
- when:
- - ansible_facts['architecture'] == 'x86_64'
-
- name: Create Jenkins runit service directory
file:
path: /etc/sv/jenkins