From 85b7df6b3184e98a78d178cd6458f0e799b753d3 Mon Sep 17 00:00:00 2001
From: Eduard Tomas <etomas@gmail.com>
Date: Fri, 12 May 2017 11:06:39 +0200
Subject: [PATCH] Removed custom docker images for redis and rabbitmq

---
 _docker/rabbitmq/Dockerfile.nanowin | 29 ----------------------------
 _docker/rabbitmq/enabled_plugins    |  1 -
 _docker/rabbitmq/rabbitmq.config    |  1 -
 _docker/redis/Dockerfile.nanowin    | 30 -----------------------------
 docker-compose-windows.yml          |  4 ++--
 5 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 _docker/rabbitmq/Dockerfile.nanowin
 delete mode 100644 _docker/rabbitmq/enabled_plugins
 delete mode 100644 _docker/rabbitmq/rabbitmq.config
 delete mode 100644 _docker/redis/Dockerfile.nanowin

diff --git a/_docker/rabbitmq/Dockerfile.nanowin b/_docker/rabbitmq/Dockerfile.nanowin
deleted file mode 100644
index 26474c235..000000000
--- a/_docker/rabbitmq/Dockerfile.nanowin
+++ /dev/null
@@ -1,29 +0,0 @@
-#https://github.com/spring2/dockerfiles/tree/master/rabbitmq
-
-FROM microsoft/windowsservercore
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
- 
-ENV chocolateyUseWindowsCompression false
-
-RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
-    choco install -y curl;
-
-RUN choco install -y erlang
-ENV ERLANG_SERVICE_MANAGER_PATH="C:\Program Files\erl8.2\erts-8.2\bin"
-RUN choco install -y rabbitmq
-ENV RABBITMQ_SERVER="C:\Program Files\RabbitMQ Server\rabbitmq_server-3.6.5"
-
-ENV RABBITMQ_CONFIG_FILE="c:\rabbitmq"
-COPY rabbitmq.config C:/
-COPY rabbitmq.config C:/Users/ContainerAdministrator/AppData/Roaming/RabbitMQ/
-COPY enabled_plugins C:/Users/ContainerAdministrator/AppData/Roaming/RabbitMQ/
-
-
-EXPOSE 4369
-EXPOSE 5672
-EXPOSE 5671
-EXPOSE 15672
-
-WORKDIR C:/Program\ Files/RabbitMQ\ Server/rabbitmq_server-3.6.5/sbin
-CMD .\rabbitmq-server.bat
\ No newline at end of file
diff --git a/_docker/rabbitmq/enabled_plugins b/_docker/rabbitmq/enabled_plugins
deleted file mode 100644
index 9eafc419b..000000000
--- a/_docker/rabbitmq/enabled_plugins
+++ /dev/null
@@ -1 +0,0 @@
-[rabbitmq_amqp1_0,rabbitmq_management].
diff --git a/_docker/rabbitmq/rabbitmq.config b/_docker/rabbitmq/rabbitmq.config
deleted file mode 100644
index f7837f213..000000000
--- a/_docker/rabbitmq/rabbitmq.config
+++ /dev/null
@@ -1 +0,0 @@
-[{rabbit, [{loopback_users, []}]}].
\ No newline at end of file
diff --git a/_docker/redis/Dockerfile.nanowin b/_docker/redis/Dockerfile.nanowin
deleted file mode 100644
index a08bcb0b6..000000000
--- a/_docker/redis/Dockerfile.nanowin
+++ /dev/null
@@ -1,30 +0,0 @@
-# The MSI installs a service which is hard to override, so let's use a zip file.
-
-FROM microsoft/windowsservercore
-MAINTAINER alexellis2@gmail.com
-
-SHELL ["powershell"]
-RUN $ErrorActionPreference = 'Stop'; \
-    wget https://github.com/MSOpenTech/redis/releases/download/win-3.2.100/Redis-x64-3.2.100.zip -OutFile Redis-x64-3.2.100.zip ; \
-    Expand-Archive Redis-x64-3.2.100.zip -dest 'C:\\Program Files\\Redis\\' ; \
-    Remove-Item Redis-x64-3.2.100.zip -Force
-
-RUN setx PATH '%PATH%;C:\\Program Files\\Redis\\'
-WORKDIR 'C:\\Program Files\\Redis\\'
-
-
-
-RUN Get-Content redis.windows.conf | Where { $_ -notmatch 'bind 127.0.0.1' } | Set-Content redis.openport.conf ; \
-  Get-Content redis.openport.conf | Where { $_ -notmatch 'protected-mode yes' } | Set-Content redis.unprotected.conf ; \
-  Add-Content redis.unprotected.conf 'protected-mode no' ; \
-    Add-Content redis.unprotected.conf 'bind 0.0.0.0' ; \
-  Get-Content redis.unprotected.conf
-
-EXPOSE 6379
-
-RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
-
-# Define our command to be run when launching the container
-CMD .\\redis-server.exe .\\redis.unprotected.conf --port 6379 ; \
-    Write-Host Redis Started... ; \
-    while ($true) { Start-Sleep -Seconds 3600 }
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 5a08a9302..48f7ef7b4 100644
--- a/docker-compose-windows.yml
+++ b/docker-compose-windows.yml
@@ -58,7 +58,7 @@ services:
     image: microsoft/mssql-server-windows
 
   basket.data:
-    image: eshop/redis-win
+    image: redis:nanoserver
 #    build:
 #      context: ./_docker/redis
 #      dockerfile: Dockerfile.nanowin
@@ -66,7 +66,7 @@ services:
         - "6379:6379"
 
   rabbitmq:
-    image: eshop/rabbitmq-win
+    image: spring2/rabbitmq
 #    build:
 #      context: ./_docker/rabbitmq
 #      dockerfile: Dockerfile.nanowin