Revert "chore: upgrade node and ruby (#261)"

This reverts commit acdb9f9.

Author: moughxyz

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+/tmp/
+.vscode
+/public/assets/
+/public/packs/

.github/workflows/dev.yml

@@ -6,12 +6,30 @@ on:
   workflow_dispatch:
 
 jobs:
+  docker_publish:
+    needs: deploy
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: standardnotes/listed
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        tags: "latest,${{ github.sha }}"
+
   deploy:
     runs-on: ubuntu-latest
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
     - uses: actions/cache@v2
       with:
         path: vendor/bundle
@@ -44,9 +62,20 @@ jobs:
         LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_DEV }}
         LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_DEV }}
 
+  notify_discord:
+    needs: deploy
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Run Discord Webhook
+      uses: johnnyhuy/actions-discord-git-webhook@main
+      with:
+        webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+
   code_scanning:
     runs-on: ubuntu-latest
-    continue-on-error: true
+
     steps:
     - uses: actions/checkout@v2
     - name: Runs Brakeman vulnerability scanner

.github/workflows/pr.yml

@@ -2,11 +2,13 @@ name: PR
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ develop ]
 
 jobs:
   test:
+
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
       - name: Runs Brakeman vulnerability scanner

.github/workflows/prod.yml

@@ -6,12 +6,28 @@ on:
   workflow_dispatch:
 
 jobs:
+  docker_publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: standardnotes/listed
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        tags: "stable,${{ github.sha }}"
+
   deploy:
     runs-on: ubuntu-latest
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
     - uses: actions/cache@v2
       with:
         path: vendor/bundle
@@ -43,3 +59,14 @@ jobs:
         LISTED_SSH_USER: ${{ secrets.LISTED_SSH_USER_PROD }}
         LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_PROD }}
         LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_PROD }}
+
+  notify_discord:
+    needs: deploy
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Run Discord Webhook
+      uses: johnnyhuy/actions-discord-git-webhook@main
+      with:
+        webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}

.nvmrc

@@ -1 +1 @@
-16.15.1
+14.18.2

.ruby-version

@@ -0,0 +1,52 @@
+FROM ruby:2.6.5-slim-stretch
+
+ARG UID=1000
+ARG GID=1000
+
+RUN addgroup --system listed --gid $GID && adduser --disabled-password --system listed --gid $GID --uid $UID
+
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+
+RUN apt-get update \
+    && apt-get install -y git build-essential libmariadb-dev curl imagemagick python \
+    && apt-get -y autoclean
+
+RUN mkdir -p /usr/local/nvm
+ENV NVM_DIR /usr/local/nvm
+ENV NODE_VERSION 10.20.1
+ENV NVM_INSTALL_PATH $NVM_DIR/versions/node/v$NODE_VERSION
+ENV WEBPACKER_NODE_MODULES_BIN_PATH=value
+
+RUN curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
+
+RUN source $NVM_DIR/nvm.sh \
+   && nvm install $NODE_VERSION \
+   && nvm alias default $NODE_VERSION \
+   && nvm use default
+
+ENV NODE_PATH $NVM_INSTALL_PATH/lib/node_modules
+ENV PATH $NVM_INSTALL_PATH/bin:$PATH
+
+RUN npm install -g yarn
+
+WORKDIR /listed
+
+RUN chown -R $UID:$GID .
+
+USER listed
+
+COPY --chown=$UID:$GID package.json yarn.lock Gemfile Gemfile.lock /listed/
+
+RUN yarn install --pure-lockfile
+
+RUN gem install bundler && bundle install
+
+COPY --chown=$UID:$GID . /listed
+
+RUN bundle exec rake assets:precompile
+
+EXPOSE 3000
+
+ENTRYPOINT [ "docker/entrypoint.sh" ]
+
+CMD [ "start" ]

Dockerfile

@@ -5,53 +5,67 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
+gem 'rails', '= 5.2.5'
+gem 'mysql2'
+gem 'puma', '~> 4.3'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+gem 'safe_yaml'
 gem 'dotenv-rails', '~> 2.7.6'
+gem 'sanitize'
+gem 'rouge'
 gem 'haml-rails'
-gem 'mini_racer', platforms: :ruby
-gem 'mysql2', '>= 0.3.13', '< 0.5'
-gem 'puma', '~> 4.3'
+gem 'whenever'
+gem 'redcarpet'
 gem 'rack-cors', :require => 'rack/cors'
-gem 'rails', '= 5.2.5'
 gem 'react_on_rails', '11.3'
-gem 'redcarpet'
-gem 'rouge'
-gem 'safe_yaml'
-gem 'sanitize'
-gem 'sass-rails', '~> 5.0'
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-gem 'uglifier', '>= 1.3.0'
 gem 'webpacker', '~> 4'
-gem 'whenever'
-gem "aws-sdk-acm", "~> 1.34"
-gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"
-gem "aws-sdk-route53", "~> 1.40"
-gem "aws-sdk-sns", "~> 1.49"
-gem "aws-sdk-sqs", "~> 1.48"
-gem "capistrano-shoryuken", "~> 0.1.5"
-gem "lograge", "~> 0.11.2"
-gem "newrelic_rpm", "= 8.2.0"
-gem "newrelic-infinite_tracing", "= 8.2.0"
-gem "rails-letsencrypt", "~> 0.9.0"
-gem "shoryuken", "~> 5.3"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
 end
 
 group :development do
-  gem 'brakeman'
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'rb-readline'
+  # Deployment tools
+  gem 'capistrano'
   gem 'capistrano-bundler'
-  gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
   gem 'capistrano-passenger', '>= 0.2.0'
   gem 'capistrano-rails'
   gem 'capistrano-rvm'
   gem 'capistrano-sidekiq'
-  gem 'capistrano'
-  gem 'listen', '~> 3.0.5'
-  gem 'rb-readline'
-  gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'spring'
-  gem 'web-console', '>= 3.3.0'
+  gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
 end
 
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'mini_racer', platforms: :ruby
+
+
+gem "rails-letsencrypt", "~> 0.9.0"
+
+gem "aws-sdk-acm", "~> 1.34"
+
+gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"
+
+gem "lograge", "~> 0.11.2"
+
+gem "aws-sdk-route53", "~> 1.40"
+
+gem "newrelic_rpm", "= 8.2.0"
+
+gem "newrelic-infinite_tracing", "= 8.2.0"
+
+gem "shoryuken", "~> 5.3"
+
+gem "capistrano-shoryuken", "~> 0.1.5"
+
+gem "aws-sdk-sqs", "~> 1.48"
+
+gem "aws-sdk-sns", "~> 1.49"