Resolving style comments from #2325. (refs #2325, refs #2221)

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index d8fa208f544b10d0bb529e6fc060bd9dc21b9fd8..e6ec0f94f6b67dd7dc1d4c442963412e1f3b6dc1 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -12,8 +12,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get -q -y install -q -y openssh-server apt-utils git curl \
-            libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
-            postgresql-server-dev-9.1 && \
+             libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
+             postgresql-server-dev-9.1 && \
     /bin/mkdir -p /root/.ssh && \
     /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     /usr/sbin/locale-gen && \

diff --git a/docker/build.sh b/docker/build.sh
index 6b2cc6be68e56c5b5f874cae08ca09d0837e7226..cbcc840667c4001365d5644be6fc4e1b16817d90 100755 (executable)
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -6,7 +6,7 @@ then
     echo "Installing Arvados requires at least Ruby 1.9.3."
     echo "You may need to enter your password."
     read -p "Press Ctrl-C to abort, or else press ENTER to install ruby1.9.3 and continue. " unused
-    
+
     sudo apt-get update
     sudo apt-get -y install ruby1.9.3
 fi

diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index 7acb888419d9a71ee3656abd66c6a11c52dc4c14..ddf923736e87f2d6b570478a88ad46b7f415223a 100755 (executable)
--- a/docker/build_tools/config.rb
+++ b/docker/build_tools/config.rb
@@ -67,7 +67,7 @@ end
 # Copy the ssh public key file to base/generated (if a path is given)
 generated_dir = File.join('base/generated')
 Dir.mkdir(generated_dir) unless Dir.exists? generated_dir
-if (config['PUBLIC_KEY_PATH'] != nil and
+if (!config['PUBLIC_KEY_PATH'].nil? and
     File.readable? config['PUBLIC_KEY_PATH'])
   FileUtils.cp(config['PUBLIC_KEY_PATH'],
                File.join(generated_dir, 'id_rsa.pub'))