From 04d086132dc23b3980dae233abbe73a5643595f2 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam@sotk.co.uk>
Date: Sat, 16 Nov 2019 20:39:24 +0000
Subject: [PATCH] Use the official Swift docker image for testing

This switches out the docker image used for Swift in our docker-compose
setup. It also adds a small script to modify the default config in that
image to allow it to be used with a StoryBoard development instance.

Change-Id: I6371eef0b54df16a8855f8cbcfcead4dd4234d10
---
 docker/docker-compose.yml | 4 ++--
 docker/fix-ini.sh         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100755 docker/fix-ini.sh

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6c6416b8..493c23cd 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,8 +19,8 @@ services:
       - RABBITMQ_DEFAULT_PASS=storyboard
 
   swift:
-    image: "bouncestorage/swift-aio"
+    image: "openstackswift/saio"
     ports:
       - "8888:8080"
     volumes:
-      - "./swift:/swift/nodes"
+      - "./fix-ini.sh:/etc/cont-init.d/fix-init.sh"
diff --git a/docker/fix-ini.sh b/docker/fix-ini.sh
new file mode 100755
index 00000000..10b09d96
--- /dev/null
+++ b/docker/fix-ini.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sed -i 's/ s3api//' /etc/swift/proxy-server.conf
+sed -i '/user = swift/a cors_allow_origin = http://localhost:9000' /etc/swift/proxy-server.conf
\ No newline at end of file