error_agency-docker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146cbf7bba5c79e41d2fdda9e3c2efc1cd226e88f159f2f1bd1cd8f1fa6db713
-  data.tar.gz: bde0db5db3ff2b473237dec4e025f87676579819c7601de97a8564da7259b152
+  metadata.gz: bfb0fe7d267cae27ff1383d9e116a8d2b387c69d0e48507047631971912f9eac
+  data.tar.gz: f16622327cb13003336240a134e7175269d768b147bf9a85b8574eaee4194809
 SHA512:
-  metadata.gz: 3bc7ec732f4b6bf96be79d4ffa798a3bc4267d9a9ef4603f7089984a6eeb8f522f09d6b7b36549dc6a73b52dcee28296f03d34f6f29ca51e0020565215ef7b3e
-  data.tar.gz: 985205d0d056912ceb5769a1f7232b3d02ec42b493260694f96721bdb7ad2533353e8cedcf78d449b016f598961b727e56eb036af1239d97977089d79b18d62c
+  metadata.gz: 465ec3d861ebbad5103335dd58b945dc820db359ac2b6169356f5d94049e47e478f2edfa533461617d1e56045d63576eb577d775859a1d16f8f30bdab1d6dd38
+  data.tar.gz: 04056b72eb7edf9ecc810c6bd9cc03941b3ca2343ff525f6159e47d7daf737873a938c95cda90c595194ede98f3dd6c17010ae160de18b9de13d10ea79e4ac67

data/lib/error_agency/docker/version.rb

@@ -1,5 +1,5 @@
 module ErrorAgency
   module Docker
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/generators/error_agency/docker/development_environment_generator.rb

@@ -11,7 +11,7 @@ module ErrorAgency
       class_option :redis, type: :boolean, desc: "Generate docker configs for Redis. Installs by default.", default: true
       class_option :mailhog, type: :boolean, desc: "Generate docker configs for Mailhog. Installed by default.", default: true
       class_option :elasticsearch, type: :boolean, desc: "Generate docker configs for Elasticsearch. NOT installed by default.", default: false
-      class_option :headless_chrome, type: :boolean, desc: "Generate configs for headless Chrome. NOT installed by default."
+      class_option :headless_chrome, type: :boolean, desc: "Generate configs for headless Chrome. NOT installed by default.", default: false
       class_option :ruby_version, type: :string, desc: "Define the Ruby version to use", default: "2.6.5"
       class_option :elasticsearch_version, type: :string, desc: "Define the Elasticsearch version to use", default: "6.2.4"
       class_option :mysql_version, type: :string, desc: "Define the MySQL version to use", default: "5.6"

data/lib/generators/error_agency/docker/templates/docker_compose.yml.erb

@@ -1,42 +1,103 @@
 version: '3.5'
 
+x-volumes: &volumes
+    - .:/app:cached
+    - bundle:/bundle
+    - node_modules:/app/node_modules
+    - packs:/app/public/packs
+    - rails_cache:/app/tmp/cache
+    - ~/.ssh:/root/.ssh
+    - irb_history:/root/irb_history
+    - ./config/docker/rails_base/.irbrc:/root/.irbrc
+
 services:
     rails_base: &rails_base
+        volumes:
+            *volumes
         build:
             context: .
             dockerfile: ./config/docker/rails_base/Dockerfile
         tmpfs:
             - /tmp
-        volumes:
-            - .:/app:cached
-            - bundle:/bundle
-            - node_modules:/app/node_modules
-            - packs:/app/public/packs
-            - rails_cache:/app/tmp/cache
-            - ~/.ssh:/root/.ssh
-            - irb_history:/root/irb_history
-            - ./config/docker/web/.irbrc:/root/.irbrc
-        stdin_open: true
-        tty: true
 
     web:
-        <<: *rails_base
+        image: rails_base:latest
+        volumes:
+            *volumes
+        depends_on:
+            - mysql
+            - redis
+            - webpacker
         ports:
             - 3000:3000
         command: rails s -b 0.0.0.0
         environment:
             - WEBPACKER_DEV_SERVER_HOST=webpacker
+        stdin_open: true
+        tty: true
+        entrypoint: ./config/docker/web/entrypoint.sh
 
     webpacker:
-        <<: *rails_base
+        image: rails_base:latest
+        volumes:
+            *volumes
+        depends_on:
+            - mysql
+            - redis
         ports:
             - 3035:3035
         command: ./bin/webpack-dev-server
         environment:
             - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
 
+    <% if @headless_chrome %>
+    tests:
+        volumes:
+            *volumes
+        logging:
+            driver: none
+        ports:
+            - 5900:5900
+        build:
+            context: .
+            shm_size: 2g
+            dockerfile: ./config/docker/tests/Dockerfile
+        command: bash # run with `docker-compose run tests guard`
+        environment:
+            - RAILS_ENV=test
+            - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
+    <% end %>
+
+    <% if @elasticsearch %>
+    elasticsearch:
+        build:
+            context: .
+            dockerfile: ./config/docker/elasticsearch/Dockerfile
+        ports:
+            - "9200:9200"
+            - "8080:8080"
+        environment:
+            # LOGSPOUT: 'ignore'
+            # ES_JAVA_OPTS: '-Xms1024m -Xmx1024m'
+            # bootstrap.memory_lock: 'false'
+            discovery.type: 'single-node'
+        # ulimits:
+        #   memlock:
+        #     soft: -1
+        #     hard: -1
+        #   nofile:
+        #     soft: 262144
+        #     hard: 262144
+        volumes:
+            - es_data:/usr/share/elasticsearch/data
+    <% end %>
+
+
+
     shell:
-        <<: *rails_base
+        image: rails_base:latest
+        volumes:
+            *volumes
         command: bash
 
     <% if @mysql %>
@@ -62,6 +123,7 @@ services:
         ports:
             - 6379:6379
     <% end %>
+
     <% if @mailhog %>
     mailhog:
         command: ["-smtp-bind-addr", "0.0.0.0:2525"]
@@ -71,47 +133,6 @@ services:
             - 2525:2525
             - 8025:8025
     <% end %>
-
-    <% if @elasticsearch %>
-    elasticsearch:
-        build:
-            context: .
-            dockerfile: ./config/docker/elasticsearch/Dockerfile
-        ports:
-            - "9200:9200"
-            - "8080:8080"
-        environment:
-            # LOGSPOUT: 'ignore'
-            # ES_JAVA_OPTS: '-Xms1024m -Xmx1024m'
-            # bootstrap.memory_lock: 'false'
-            discovery.type: 'single-node'
-        # ulimits:
-        #   memlock:
-        #     soft: -1
-        #     hard: -1
-        #   nofile:
-        #     soft: 262144
-        #     hard: 262144
-        volumes:
-            - es_data:/usr/share/elasticsearch/data
-        healthcheck:
-            test: ["CMD", "curl", "-SsfL", "127.0.0.1:9200/_cat/health?h=status"]
-            interval: 10s
-            timeout: 1s
-            retries: 10
-    <% end %>
-
-    <% if @headless_chrome %>
-    chrome:
-    logging:
-        driver: none
-    ports:
-        - 5900:5900
-    build:
-        context: .
-        shm_size: 2g
-        dockerfile: ./config/docker/chrome/Dockerfile
-    <% end %>
 volumes:
     bundle:
     node_modules:
@@ -120,3 +141,5 @@ volumes:
     db_data:
     irb_history:
     <% if @elasticsearch %>es_data:<% end %>
+
+

data/lib/generators/error_agency/docker/templates/mysql/my.cnf

@@ -0,0 +1,15 @@
+[mysqld]
+innodb_buffer_pool_size = 256M
+innodb_file_per_table= 1
+# Set the innodb file format to Barracuda
+innodb_file_format = Barracuda
+# Set large prefix on
+innodb_large_prefix = 1
+init_connect='SET collation_connection = utf8mb4_unicode_ci'
+init_connect='SET NAMES utf8mb4'
+innodb_file_format_max = Barracuda
+innodb_strict_mode = 1
+character_set_server = 'utf8mb4'
+collation_server = 'utf8mb4_unicode_ci'
+innodb_log_file_size = 50G
+max_allowed_packet = 1073741824

data/lib/generators/error_agency/docker/templates/rails_base/Dockerfile.erb

@@ -13,8 +13,6 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources
 
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends nodejs yarn
 
-RUN gem update --system && gem install bundler -v '2'
-
 # Configure bundler and PATH
 ENV LANG=C.UTF-8 \
 GEM_HOME=/bundle \
@@ -25,7 +23,9 @@ ENV BUNDLE_APP_CONFIG=$BUNDLE_PATH \
 BUNDLE_BIN=$BUNDLE_PATH/bin
 ENV PATH /app/bin:$BUNDLE_BIN:$PATH
 
+RUN gem update --system && gem install bundler -v 2.0.2
+
 RUN mkdir -p /app
 
 ENTRYPOINT ["/app/config/docker/rails_base/entrypoint.sh"]
-WORKDIR /app
+WORKDIR /app

data/lib/generators/error_agency/docker/templates/tests/Dockerfile.erb

@@ -0,0 +1,4 @@
+FROM selenium/standalone-chrome
+FROM rails_base:latest
+LABEL maintainer='paul@error.agency'
+CMD ["/bin/sh"]

data/lib/generators/error_agency/docker/templates/web/entrypoint.sh.erb

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+echo "Building Rails dependencies and creating database..."
+echo -n "Bundle..."
+bundle &> /dev/null
+echo "done"
+
+echo -n "Yarn..."
+yarn &> /dev/null
+echo "done"
+
+echo -n "Rails db:create..."
+rails db:create &> /dev/null
+echo "done"
+
+rm -f /app/tmp/pids/server.pid
+exec "$@"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: error_agency-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ed Jones
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,11 @@ files:
 - lib/generators/error_agency/docker/development_environment_generator.rb
 - lib/generators/error_agency/docker/templates/docker_compose.yml.erb
 - lib/generators/error_agency/docker/templates/elasticsearch/Dockerfile.erb
-- lib/generators/error_agency/docker/templates/headless_chrome/Dockerfile.erb
+- lib/generators/error_agency/docker/templates/mysql/my.cnf
 - lib/generators/error_agency/docker/templates/rails_base/Dockerfile.erb
 - lib/generators/error_agency/docker/templates/rails_base/entrypoint.sh.erb
+- lib/generators/error_agency/docker/templates/tests/Dockerfile.erb
+- lib/generators/error_agency/docker/templates/web/entrypoint.sh.erb
 homepage: https://github.com/errorstudio/error_agency-docker
 licenses:
 - MIT

data/lib/generators/error_agency/docker/templates/headless_chrome/Dockerfile.erb

@@ -1,2 +0,0 @@
-FROM selenium/standalone-chrome
-LABEL maintainer='ed@error.agency'