From bb511c0b9c011610d38dc10f6312a6b83720aa42 Mon Sep 17 00:00:00 2001 From: Tim Pierce Date: Thu, 3 Apr 2014 15:08:15 -0400 Subject: [PATCH] Resolving style comments from #2325. (refs #2325, refs #2221) --- docker/base/Dockerfile | 4 ++-- docker/build.sh | 2 +- docker/build_tools/config.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index d8fa208f54..e6ec0f94f6 100644 --- 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 6b2cc6be68..cbcc840667 100755 --- 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 7acb888419..ddf923736e 100755 --- 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')) -- 2.30.2