From c445de655ab288de8d4043aad26894b66a6943b0 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 10 Oct 2018 15:08:09 -0700
Subject: [PATCH] Quick-start: remove ansible Dockerfile

It takes a long time to install ansible, but we have it installed
already in the zuul image (for the executor).  Just use that instead.

Change-Id: I2dc2d6f5e5e83bb0654c45b27b8d37dc161f7841
---
 doc/source/admin/examples/ansible-Dockerfile              | 3 ---
 doc/source/admin/examples/docker-compose.yaml             | 8 +-------
 .../playbooks/roles/create_project/tasks/main.yaml        | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 doc/source/admin/examples/ansible-Dockerfile

diff --git a/doc/source/admin/examples/ansible-Dockerfile b/doc/source/admin/examples/ansible-Dockerfile
deleted file mode 100644
index baff3e7b6a..0000000000
--- a/doc/source/admin/examples/ansible-Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM python:alpine
-
-RUN apk add --no-cache openssh git build-base openssl-dev libffi-dev bash && pip install ansible
diff --git a/doc/source/admin/examples/docker-compose.yaml b/doc/source/admin/examples/docker-compose.yaml
index 31b74a4cbb..6015fec8c1 100644
--- a/doc/source/admin/examples/docker-compose.yaml
+++ b/doc/source/admin/examples/docker-compose.yaml
@@ -9,13 +9,7 @@ services:
       - "8080:8080"
       - "29418:29418"
   gerritconfig:
-    build:
-      dockerfile: ansible-Dockerfile
-      context: ./
-      args:
-        http_proxy: "${http_proxy}"
-        https_proxy: "${http_proxy}"
-        no_proxy: "${no_proxy}"
+    image: zuul/zuul
     environment:
       no_proxy: "${no_proxy},gerrit"
     depends_on:
diff --git a/doc/source/admin/examples/playbooks/roles/create_project/tasks/main.yaml b/doc/source/admin/examples/playbooks/roles/create_project/tasks/main.yaml
index 475b7fe272..c8001aec2e 100644
--- a/doc/source/admin/examples/playbooks/roles/create_project/tasks/main.yaml
+++ b/doc/source/admin/examples/playbooks/roles/create_project/tasks/main.yaml
@@ -18,7 +18,7 @@
         status_code: 201
     - name: Create initial commit in {{ project }}
       shell:
-        executable: /bin/bash
+        executable: /bin/sh
         chdir: "{{ project_tmp.stdout }}"
         cmd: |
           git init .