diff --git a/.docker-config/Dockerfile b/.docker-config/Dockerfile index 1424335d..717b8201 100644 --- a/.docker-config/Dockerfile +++ b/.docker-config/Dockerfile @@ -1,32 +1,36 @@ -FROM ruby:2.5.1 +FROM ruby:2.7.2 -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && \ +RUN wget https://dl.yarnpkg.com/debian/pubkey.gpg +RUN curl https://deb.nodesource.com/setup_14.x | bash +RUN cat pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get update && \ apt-get install -qq -y build-essential libpq-dev \ postgresql-client nodejs yarn \ wget xvfb unzip && \ rm -rf /var/lib/apt/lists/* -ENV BUNDLER_VERSION='1.17.3' -RUN gem install bundler:1.17.3 +# remove pubkey +RUN rm pubkey.gpg -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | \ - apt-key add - && \ - echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> \ - /etc/apt/sources.list.d/google.list && \ - apt-get update -y && \ - apt-get install -y google-chrome-stable && \ - rm -rf /var/lib/apt/lists/* +ENV BUNDLER_VERSION='2.4.13' +RUN gem install bundler:2.4.13 + +# RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | \ +# apt-key add - && \ +# echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> \ +# /etc/apt/sources.list.d/google.list && \ +# apt-get update -y && \ +# apt-get install -y google-chrome-stable && \ +# rm -rf /var/lib/apt/lists/* -ENV CHROMEDRIVER_VERSION 2.19 -ENV CHROMEDRIVER_DIR /chromedriver +# ENV CHROMEDRIVER_VERSION 2.19 +# ENV CHROMEDRIVER_DIR /chromedriver -RUN mkdir $CHROMEDRIVER_DIR && \ - wget -q --continue -P $CHROMEDRIVER_DIR "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip" && \ - unzip $CHROMEDRIVER_DIR/chromedriver* -d $CHROMEDRIVER_DIR +# RUN mkdir $CHROMEDRIVER_DIR && \ +# wget -q --continue -P $CHROMEDRIVER_DIR "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip" && \ +# unzip $CHROMEDRIVER_DIR/chromedriver* -d $CHROMEDRIVER_DIR -ENV PATH $CHROMEDRIVER_DIR:$PATH +# ENV PATH $CHROMEDRIVER_DIR:$PATH WORKDIR /usr/src/app diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3940629..4c996dd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: env: RAILS_ENV: test - DATABASE_URL: "postgresql://root@localhost/adventure-time_test?pool=5" + DATABASE_URL: "postgresql://root:password@localhost/adventure-time_test?pool=5" TZ: "/usr/share/zoneinfo/America/New_York" COV: '1' BUNDLER_PATH: vendor/bundle @@ -16,11 +16,11 @@ jobs: services: postgres: - image: postgres:10.1-alpine + image: postgres:14.12-alpine env: POSTGRES_USER: root POSTGRES_DB: adventure-time_test - POSTGRES_PASSWORD: "" + POSTGRES_PASSWORD: password ports: - 5432:5432 # Add a health check @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up ruby 2.5.1 + - name: Set up ruby 2.7.2 uses: ruby/setup-ruby@v1 - name: Set up Ruby dependencies diff --git a/.ruby-version b/.ruby-version index 73462a5a..37c2961c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 +2.7.2 diff --git a/.tool-versions b/.tool-versions index 08e6e7d0..2e8bb0bb 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -ruby 2.5.1 +ruby 2.7.2 nodejs 14.17.0 yarn 1.22.19 diff --git a/Gemfile b/Gemfile index 290d0c30..39248b7a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '2.7.2' gem 'awesome_print' gem 'bcrypt' @@ -43,6 +43,7 @@ group :test do gem 'capybara', '>= 2.15' gem 'database_cleaner', '~> 0.9.1' gem "factory_bot_rails" + gem 'factory_bot', '6.4.4' gem 'selenium-webdriver' gem 'simplecov', require: false gem 'webdrivers', '< 4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2a9d1a4b..46cd81bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,49 +23,49 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.1) - actionpack (= 5.2.1) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.1) - actionpack (= 5.2.1) - actionview (= 5.2.1) - activejob (= 5.2.1) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.1) - actionview (= 5.2.1) - activesupport (= 5.2.1) - rack (~> 2.0) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + 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.1) - activesupport (= 5.2.1) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.1) - activesupport (= 5.2.1) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.1) - activesupport (= 5.2.1) - activerecord (5.2.1) - activemodel (= 5.2.1) - activesupport (= 5.2.1) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activestorage (5.2.1) - actionpack (= 5.2.1) - activerecord (= 5.2.1) - marcel (~> 0.3.1) - activesupport (5.2.1) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) + marcel (~> 1.0.0) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) administrate (0.13.0) actionpack (>= 4.2) actionview (>= 4.2) @@ -77,51 +77,52 @@ GEM momentjs-rails (~> 2.8) sassc-rails (~> 2.1) selectize-rails (~> 0.6) - airrecord (1.0.9) - faraday (>= 0.10, < 3.0) + airrecord (1.0.12) + faraday (>= 1.0, < 3.0) faraday-net_http_persistent net-http-persistent arel (9.0.0) - autoprefixer-rails (9.7.6) - execjs - awesome_print (1.8.0) - bcrypt (3.1.13) - bindex (0.5.0) - bootsnap (1.3.2) - msgpack (~> 1.0) - builder (3.2.3) - capistrano (2.15.9) + autoprefixer-rails (10.4.16.0) + execjs (~> 2) + awesome_print (1.9.2) + base64 (0.2.0) + bcrypt (3.1.20) + bindex (0.8.1) + bootsnap (1.18.3) + msgpack (~> 1.2) + builder (3.2.4) + capistrano (2.15.11) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - capybara (3.10.1) + capybara (3.39.2) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) - coderay (1.1.2) - concurrent-ruby (1.1.5) - connection_pool (2.2.5) - crass (1.0.5) + coderay (1.1.3) + concurrent-ruby (1.3.1) + connection_pool (2.4.1) + crass (1.0.6) database_cleaner (0.9.1) + date (3.3.4) datetime_picker_rails (0.0.7) momentjs-rails (>= 2.8.1) - devise (4.7.1) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.3) - docile (1.3.2) + diff-lcs (1.5.1) + docile (1.4.0) dragonfly (1.4.0) addressable (~> 2.3) multi_json (~> 1.0) @@ -129,166 +130,186 @@ GEM dragonfly-s3_data_store (1.3.0) dragonfly (~> 1.0) fog-aws - erubi (1.8.0) - ethon (0.12.0) - ffi (>= 1.3.0) - excon (0.85.0) - execjs (2.7.0) - factory_bot (5.2.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.2.0) - factory_bot (~> 5.2.0) - railties (>= 4.2.0) - faraday (0.15.2) - multipart-post (>= 1.2, < 3) - faraday-net_http_persistent (1.2.0) - ffi (1.9.25) - fog-aws (3.10.0) + erubi (1.12.0) + ethon (0.16.0) + ffi (>= 1.15.0) + excon (0.110.0) + execjs (2.9.1) + factory_bot (6.4.4) + activesupport (>= 5.0.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) + railties (>= 5.0.0) + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + faraday-net_http_persistent (2.1.0) + faraday (~> 2.5) + net-http-persistent (~> 4.0) + ffi (1.16.3) + fog-aws (3.22.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-core (2.2.4) + fog-core (2.4.0) builder excon (~> 0.71) - formatador (~> 0.2) + formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-xml (0.1.3) + fog-xml (0.1.4) fog-core nokogiri (>= 1.5.11, < 2.0.0) - formatador (0.3.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - highline (2.0.3) - i18n (1.6.0) + formatador (1.1.0) + globalid (1.1.0) + activesupport (>= 5.0) + highline (2.1.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - ipaddress (0.8.3) - jquery-rails (4.3.3) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.0) - kaminari (1.2.0) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.0) - kaminari-activerecord (= 1.2.0) - kaminari-core (= 1.2.0) - kaminari-actionview (1.2.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.0) - kaminari-activerecord (1.2.0) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.0) - kaminari-core (1.2.0) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.3.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mime-types (3.3.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) + matrix (0.4.2) + method_source (1.1.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.12.0) - momentjs-rails (2.20.1) + mime-types-data (3.2024.0507) + mini_mime (1.1.5) + mini_portile2 (2.8.6) + minitest (5.23.1) + momentjs-rails (2.29.4.1) railties (>= 3.1) - msgpack (1.2.4) + msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.0.0) - net-http-persistent (4.0.1) + net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-ssh (6.0.2) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-smtp (0.5.0) + net-protocol + net-ssh (7.2.3) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) - nio4r (2.3.1) - nokogiri (1.10.5) - mini_portile2 (~> 2.4.0) + nio4r (2.7.3) + nokogiri (1.15.6) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) orm_adapter (0.5.0) - pg (1.1.3) + pg (1.5.6) pointless_feedback (4.1.5) airrecord (~> 1.0) jquery-rails (>= 4.0) rails (>= 4.0) typhoeus (~> 0.7, >= 0.7.3) - pry (0.12.0) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-rails (0.3.7) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (3.0.3) - puma (3.12.2) - rack (2.1.2) - rack-proxy (0.6.5) + public_suffix (5.0.5) + puma (3.12.6) + racc (1.8.0) + rack (2.2.9) + rack-proxy (0.7.7) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.1) - actioncable (= 5.2.1) - actionmailer (= 5.2.1) - actionpack (= 5.2.1) - actionview (= 5.2.1) - activejob (= 5.2.1) - activemodel (= 5.2.1) - activerecord (= 5.2.1) - activestorage (= 5.2.1) - activesupport (= 5.2.1) + rack-test (2.1.0) + rack (>= 1.3) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.2.1) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.1) - actionpack (= 5.2.1) - activesupport (= 5.2.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - regexp_parser (1.2.0) - responders (3.0.0) - actionpack (>= 5.0) - railties (>= 5.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + regexp_parser (2.9.2) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) + rexml (3.2.8) + strscan (>= 3.0.9) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.0) + rspec-support (~> 3.13.0) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.9.3) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.13.1) + ruby2_keywords (0.0.5) ruby_dep (1.5.0) rubyzip (1.3.0) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -297,57 +318,60 @@ GEM sprockets-rails tilt selectize-rails (0.12.6) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) - sentry-raven (2.7.4) - faraday (>= 0.7.6, < 1.0) - simplecov (0.17.0) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + sentry-raven (3.1.2) + faraday (>= 1.0) + simplecov (0.22.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - spring (2.0.2) - activesupport (>= 4.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - stat_board (1.1.0) + stat_board (1.1.1) rails (>= 3.2.0) - thor (0.20.3) + strscan (3.1.0) + thor (1.3.1) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.3.0) + timeout (0.4.1) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (1.2.5) + tzinfo (1.2.11) thread_safe (~> 0.1) - uglifier (4.1.19) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - warden (1.2.8) - rack (>= 2.0.6) + warden (1.2.9) + rack (>= 2.0.9) web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webdrivers (4.0.1) + webdrivers (2.4.0) nokogiri (~> 1.6) rubyzip (~> 1.0) - selenium-webdriver (>= 3.0, < 4.0) webpacker (4.0.7) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.7.0) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.5) whenever (0.8.4) activesupport (>= 2.3.4) chronic (>= 0.6.3) @@ -368,6 +392,7 @@ DEPENDENCIES devise dragonfly dragonfly-s3_data_store + factory_bot (= 6.4.4) factory_bot_rails listen (>= 3.0.5, < 3.2) mimemagic! @@ -390,7 +415,7 @@ DEPENDENCIES webpacker (~> 4.0.7) RUBY VERSION - ruby 2.5.1p57 + ruby 2.7.2p137 BUNDLED WITH - 1.17.3 + 2.4.13 diff --git a/app/assets/stylesheets/.gitkeep b/app/assets/stylesheets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/bin/spring b/bin/spring index fb2ec2eb..d89ee495 100755 --- a/bin/spring +++ b/bin/spring @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -# This file loads spring without using Bundler, in order to be fast. +# This file loads Spring without using Bundler, in order to be fast. # It gets overwritten when you run the `spring binstub` command. unless defined?(Spring) @@ -8,7 +8,7 @@ unless defined?(Spring) require 'bundler' lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) - spring = lockfile.specs.detect { |spec| spec.name == "spring" } + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } if spring Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path gem 'spring', spring.version diff --git a/config/deploy.rb b/config/deploy.rb index ab9fcf3d..0b197a44 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -4,7 +4,7 @@ require 'capistrano-db-tasks' set :application, 'storyboard' -set :repository, 'git@github.com:vigetlabs/adventure-time.git' +set :repository, 'git@github.com:vigetlabs/storyboard.git' set :branch, 'main' before 'deploy:assets:precompile', 'deploy:assets:node_modules' diff --git a/docker-compose.yml b/docker-compose.yml index 86e4ea3e..4176a8d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.2" services: db: - image: postgres:10.6-alpine + image: postgres:14.12-alpine volumes: - db-data:/var/lib/postgresql/data environment: @@ -11,6 +11,7 @@ services: POSTGRES_DB: adventure-time_development app: + platform: linux/x86_64 image: storyboard_app build: context: . @@ -20,7 +21,8 @@ services: ports: - 3000:3000 environment: - WEBPACKER_DEV_SERVER_HOST: webpack + - WEBPACKER_DEV_SERVER_HOST=webpack + - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock depends_on: - db volumes: @@ -37,6 +39,7 @@ services: stdin_open: true webpack: + platform: linux/x86_64 image: storyboard_app command: [ "./.docker-config/wait-for-it.sh",