From d117d3d2368320851ce7d8c1f8c769172696f0fe Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 27 Jan 2018 15:23:22 +0100
Subject: [PATCH] Few typo and ordering fixes

---
 ckan/Dockerfile       | 2 +-
 cts/Dockerfile        | 2 +-
 openmapkit/Dockerfile | 2 +-
 pandora.sh            | 5 ++---
 redis.sh              | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index ef3496a..a586941 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -18,7 +18,7 @@ RUN \
 
 RUN \
  # Install build dependencies
- apk --no-cache add --virtual .deps git build-base libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \
+ apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \
  # Hackfix for python find_library('c') call
  && ln -s /lib/ld-musl-x86_64.so.1 /lib/libc.so.1 \
  # Install CKAN
diff --git a/cts/Dockerfile b/cts/Dockerfile
index 5188810..ad0ce7b 100644
--- a/cts/Dockerfile
+++ b/cts/Dockerfile
@@ -14,7 +14,7 @@ RUN \
 
 RUN \
  # Install build dependencies
- apk --no-cache add --virtual .deps git build-base postgresql-dev python2-dev py2-pip zlib-dev \
+ apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev \
  # Install CTS
  && git clone --depth 1 https://github.com/theirc/CTS /srv/cts \
  # Force psycopg2 version update for compatibility with PostgreSQL 10
diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile
index cb99f3d..63abf75 100644
--- a/openmapkit/Dockerfile
+++ b/openmapkit/Dockerfile
@@ -24,7 +24,7 @@ RUN \
 
 RUN \
  # Install build dependencies
- apk --no-cache add --virtual .deps git build-base py2-pip yarn \
+ apk --no-cache add --virtual .deps build-base git py2-pip yarn \
  # Clone OpenMapKit
  && git clone --depth 1 https://github.com/AmericanRedCross/OpenMapKitServer /srv/openmapkit \
  && cd /srv/openmapkit \
diff --git a/pandora.sh b/pandora.sh
index 62bc23f..b815fd1 100755
--- a/pandora.sh
+++ b/pandora.sh
@@ -3,9 +3,8 @@
 SOURCE_DIR=$(realpath $(dirname "${0}"))/pandora
 
 # Check prerequisites
-SCRIPT_DIR=$(realpath $(dirname "${0}"))
-docker image ls | grep -q rabbitmq || ${SCRIPT_DIR}/rabbitmq.sh
-docker image ls | grep -q postgres || ${SCRIPT_DIR}/postgres.sh
+docker image ls | grep -q rabbitmq || $(realpath $(dirname "${0}"))/rabbitmq.sh
+docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh
 
 # Build Docker container
 docker build -t pandora ${SOURCE_DIR}
diff --git a/redis.sh b/redis.sh
index fdf60dc..cce1a0d 100755
--- a/redis.sh
+++ b/redis.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 SOURCE_DIR=$(realpath $(dirname "${0}"))/redis
+
 # Build Docker container
 docker build -t redis ${SOURCE_DIR}