Upgrade, fixes, caddy SSL + Basic Auth in pullpreview mode

Author: crohr

.github/workflows/pullpreview.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           admins: crohr
           always_on: master
-          compose_files: "docker-compose.yml,docker-compose.staging.yml"
+          compose_files: "docker-compose.yml,docker-compose.pullpreview.yml"
           default_port: 443
           instance_type: "micro_2_0"
         env:

.gitignore

@@ -15,3 +15,4 @@
 /log/*
 !/log/.keep
 /tmp
+/node_modules

Dockerfile

@@ -1,7 +1,7 @@
 # Use the barebones version of Ruby 2.2.3.
 FROM ruby:2.7-slim
 
-MAINTAINER Cyril Rohr <cyril@pullpreview.com>
+MAINTAINER Cyril Rohr <support@pullpreview.com>
 
 # Install dependencies:
 RUN apt-get update && apt-get install -qq -y build-essential nodejs libpq-dev postgresql-client
@@ -30,3 +30,5 @@ RUN bundle exec rake RAILS_ENV=production DATABASE_URL=postgresql://user:pass@12
 
 # The default command that gets ran will be to start the Unicorn server.
 CMD ./docker/web
+
+EXPOSE 3000

Gemfile.lock

@@ -1,154 +1,155 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
+    actioncable (5.2.6.2)
+      actionpack (= 5.2.6.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
+    actionmailer (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      actionview (= 5.2.6.2)
+      activejob (= 5.2.6.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionpack (5.2.6.2)
+      actionview (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionview (5.2.6.2)
+      activesupport (= 5.2.6.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activejob (5.2.6.2)
+      activesupport (= 5.2.6.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activemodel (5.2.6.2)
+      activesupport (= 5.2.6.2)
+    activerecord (5.2.6.2)
+      activemodel (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       arel (>= 9.0)
-    activestorage (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.2)
+    activestorage (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      activerecord (= 5.2.6.2)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.0)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crass (1.0.6)
-    debug_inspector (0.0.2)
-    erubi (1.9.0)
-    execjs (2.7.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.2)
+    debug_inspector (1.1.0)
+    erubi (1.10.0)
+    execjs (2.8.1)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.2.1)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    loofah (2.5.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    pg (0.18.4)
-    puma (3.12.4)
-    rack (2.2.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    pg (1.3.2)
+    puma (5.6.2)
+      nio4r (~> 2.0)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.2)
-      actioncable (= 5.2.4.2)
-      actionmailer (= 5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      activestorage (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    rails (5.2.6.2)
+      actioncable (= 5.2.6.2)
+      actionmailer (= 5.2.6.2)
+      actionpack (= 5.2.6.2)
+      actionview (= 5.2.6.2)
+      activejob (= 5.2.6.2)
+      activemodel (= 5.2.6.2)
+      activerecord (= 5.2.6.2)
+      activestorage (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.2)
+      railties (= 5.2.6.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (5.2.6.2)
+      actionpack (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
+    rake (13.0.6)
     record_tag_helper (1.0.1)
       actionview (>= 5)
-    redis (3.3.1)
-    redis-actionpack (5.2.0)
-      actionpack (>= 5, < 7)
+    redis (4.6.0)
+    redis-actionpack (5.3.0)
+      actionpack (>= 5, < 8)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.0)
-      activesupport (>= 3, < 7)
+    redis-activesupport (5.3.0)
+      activesupport (>= 3, < 8)
       redis-store (>= 1.3, < 2)
-    redis-rack (2.1.2)
+    redis-rack (2.1.4)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.6.0)
-      redis (>= 2.2, < 5)
-    sidekiq (4.0.2)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      redis (~> 3.2, >= 3.2.1)
-    sprockets (3.7.2)
+    redis-store (1.9.1)
+      redis (>= 4, < 5)
+    sidekiq (6.4.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
@@ -165,4 +166,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   2.0.1
+   2.2.22

README.md

@@ -5,3 +5,12 @@
 Have a look at the `.github/workflows/pullpreview.yml` file, as well as the `docker-compose.*` files to see how it's setup.
 
 Deployments are visible on https://github.com/pullpreview/demo-ruby-on-rails/deployments.
+
+In this demo, PullPreview is configured with Caddy as a proxy, which automatically provides SSL certificates, as well as protecting the access to the preview environment with a Basic Auth:
+
+- username=`admin`
+- password=`p4ssw0rd`
+
+## How to run locally for development
+
+    PULLPREVIEW_PUBLIC_DNS=perso.click docker-compose -f docker-compose.yml -f docker-compose.pullpreview.yml up

app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

config/unicorn.rb

@@ -1,8 +1,8 @@
-version: '3'
+version: "3"
 services:
   web:
     ports:
-      - '80:8000'
+      - "80:3000"
     env_file:
       - .env.development
   worker:

docker-compose.override.yml

@@ -1,17 +1,20 @@
-version: '3'
+version: "3"
 services:
   web:
-    ports:
-      - "8000"
     env_file:
       - .env.staging
   worker:
     env_file:
       - .env.staging
   proxy:
     image: caddy:2-alpine
-    command: "caddy reverse-proxy --from ${PULLPREVIEW_PUBLIC_DNS} --to web:8000"
+    environment:
+      - SITE_FQDN=${PULLPREVIEW_PUBLIC_DNS}
+      - SITE_PASSWORD
+    command: "/docker/caddy/run"
     restart: unless-stopped
+    volumes:
+      - "./docker/caddy:/docker/caddy"
     depends_on:
       - web
     networks: