Stylistic refactoring of Ruby code and added proxy support

Author: Circle CI Automated Builder

.docker/nginx/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf

.docker/nginx/nginx.conf

@@ -0,0 +1,43 @@
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+
+    keepalive_timeout       600;
+    proxy_connect_timeout   600;
+    proxy_send_timeout      600;
+    proxy_read_timeout      600;
+
+    server {
+        listen 80;
+
+        location /confluence {
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Server $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://container:8090/confluence;
+            client_max_body_size 100M;
+        }
+    }
+}

.rspec

@@ -1,4 +1,3 @@
 --color
 --require spec_helper
 --format documentation
---fail-fast

.rubocop.yml

@@ -0,0 +1,25 @@
+AllCops:
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/fixtures/**/*'
+    - 'tmp/**/*'
+  TargetRubyVersion: 2.2
+
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/AlignHash:
+  Enabled: false
+
+Style/AlignParameters:
+  Enabled: false
+
+Style/PredicateName:
+  Enabled: false

.travis.yml

@@ -6,10 +6,8 @@ services:
   - docker
 
 before_install:
-  - docker pull blacklabelops/nginx:latest
+  - docker pull nginx:alpine
   - docker pull postgres:9.3
   - docker pull mysql:5.6
   - docker pull java:8
   - docker build .
-  - travis_wait 30 &
-  

Dockerfile

@@ -36,7 +36,7 @@ RUN set -x \
         --delete               "Server/Service/Engine/Host/@debug" \
         --delete               "Server/Service/Engine/Host/Context/@debug" \
                                "${CONF_INSTALL}/conf/server.xml" \
-    && touch -d "@0"           "/opt/atlassian/confluence/conf/server.xml"
+    && touch -d "@0"           "${CONF_INSTALL}/conf/server.xml"
 
 # Use the default unprivileged account. This could be considered bad practice
 # on systems where multiple processes end up being executed by 'daemon' but
@@ -49,7 +49,7 @@ EXPOSE 8090
 # Set volume mount points for installation and home directory. Changes to the
 # home directory needs to be persisted as well as parts of the installation
 # directory due to eg. logs.
-VOLUME ["/var/atlassian/confluence"]
+VOLUME ["/var/atlassian/confluence", "/opt/atlassian/confluence/logs"]
 
 # Set the default working directory as the Confluence home directory.
 WORKDIR /var/atlassian/confluence

Gemfile

@@ -1,21 +1,14 @@
 source 'https://rubygems.org'
-# currently used ruby version
-ruby '2.2.3'
 
-group :test do
-  gem 'rake'
-  # libraries for acceptance testing
-  gem 'rspec'
-  gem 'serverspec'
-  gem 'capybara'
-  gem 'poltergeist'
-  gem 'poltergeist-suppressor'
-  # libraries for Docker
-  gem 'docker-api', require: 'docker'
-  gem 'archive-tar-minitar'
-  gem 'rspec_junit_formatter'
+gem 'rake'
+gem 'rspec'
 
-  gem 'pry'
-  gem 'pry-rescue'
-  gem 'byebug'
-end
+gem 'capybara'
+gem 'poltergeist'
+gem 'poltergeist-suppressor'
+
+gem 'docker-api', require: 'docker'
+gem 'archive-tar-minitar'
+gem 'rspec_junit_formatter'
+
+gem 'pry'

Gemfile.lock

@@ -3,34 +3,28 @@ GEM
   specs:
     archive-tar-minitar (0.5.2)
     builder (3.2.2)
-    byebug (8.2.1)
     capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     cliver (0.3.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.24.1)
+    docker-api (1.23.0)
       excon (>= 0.38.0)
       json
     excon (0.45.4)
-    interception (0.5)
     json (1.8.3)
     method_source (0.8.2)
     mime-types (3.0)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2015.1120)
-    mini_portile2 (2.0.0)
+    mini_portile (0.6.2)
     multi_json (1.11.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-telnet (0.1.1)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.6.4)
+      mini_portile (~> 0.6.0)
     poltergeist (1.8.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -43,9 +37,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rescue (1.4.2)
-      interception (>= 0.5)
-      pry
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -59,28 +50,14 @@ GEM
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    serverspec (2.24.3)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.43)
-    sfl (2.2)
     slop (3.6.0)
-    specinfra (2.44.6)
-      net-scp
-      net-ssh (~> 2.7)
-      net-telnet
-      sfl
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -92,14 +69,14 @@ PLATFORMS
 
 DEPENDENCIES
   archive-tar-minitar
-  byebug
   capybara
   docker-api
   poltergeist
   poltergeist-suppressor
   pry
-  pry-rescue
   rake
   rspec
   rspec_junit_formatter
-  serverspec
+
+BUNDLED WITH
+   1.11.2

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Martin Aksel Jensen <[email protected]>
+Copyright (c) 2016 Martin Aksel Jensen, [email protected]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Prepare Git committer information
-git config user.email "circleci@circleci"
+git config user.email "[email protected]"
 git config user.name "Circle CI Automated Builder"
 
 # Obtain the currently latest version of Atlassian Confluence version defined by the

bin/deploy

@@ -6,10 +6,10 @@ machine:
 
 dependencies:
   pre:
-    - docker pull blacklabelops/nginx:latest
+    - docker pull nginx:alpine
     - docker pull postgres:9.3
     - docker pull mysql:5.6
-    - docker pull java:8
+    - docker pull java:7
     - docker build .
 
 test:

circle.yml

@@ -1,6 +1,3 @@
-require 'docker'
-require 'spec_helper'
-
 describe 'Docker image building' do
   context 'when validating host software' do
     it 'should supported version' do
@@ -15,7 +12,7 @@
     it { is_expected.to have_exposed_port tcp: 8090 }
     it { is_expected.to_not have_exposed_port udp: 8090 }
     it { is_expected.to have_volume '/var/atlassian/confluence' }
-    it { is_expected.not_to have_volume '/opt/atlassian/confluence' }
+    it { is_expected.to have_volume '/opt/atlassian/confluence/logs' }
     it { is_expected.to have_working_directory '/var/atlassian/confluence' }
   end
 end