Merge pull request #412 from codeforjapan/develop

update v0.25.2

.dockerignore

@@ -1,5 +1,4 @@
 *.md
-*.log
 
 .env
 .gitignore
@@ -10,7 +9,7 @@
 .git
 
 deployments
-log
+log/*
 node_modules
 spec
 test

.gitignore

@@ -44,3 +44,11 @@ pgadmin
 
 # Igonre idea
 .idea
+
+/public/packs
+/public/decidim-packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.23.0-alpine as node
+FROM node:16.9.1-alpine as node
 
 FROM ruby:2.7.4-alpine
 
@@ -12,18 +12,19 @@ RUN apk update \
         postgresql-dev \
         tzdata \
         zip \
+        gcompat\
     && cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
 ENV YARN_VERSION=v1.22.5
 
 # node install
 COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /usr/local/include/node /usr/local/include/node
 COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
 COPY --from=node /opt/yarn-${YARN_VERSION} /opt/yarn
-RUN ln -s /usr/local/bin/node /usr/local/bin/nodejs \
-    && ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \
-    && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn
+RUN ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
+  && ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
 
 ARG RAILS_ENV="production"
 
@@ -41,7 +42,9 @@ WORKDIR $APP_HOME
 
 COPY Gemfile Gemfile.lock ./
 
-COPY . $APP_HOME
+COPY decidim-comments /app/decidim-comments
+COPY omniauth-line_login /app/omniauth-line_login
+COPY decidim-user_extension /app/decidim-user_extension
 
 # bundle install
 RUN gem install bundler:${BUNDLER_VERSION} \
@@ -53,11 +56,14 @@ RUN gem install bundler:${BUNDLER_VERSION} \
             bundle install \
         ;fi
 
+COPY . $APP_HOME
+
 RUN cp ./entrypoint /usr/bin/entrypoint \
     && chmod +x /usr/bin/entrypoint \
     && chmod -R +x ./bin/
 
-RUN ./bin/rails assets:precompile \
+RUN yarn install \
+    && ./bin/rails assets:precompile \
     && yarn cache clean
 
 ENTRYPOINT ["entrypoint"]

Gemfile

@@ -4,37 +4,36 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "0.24.3"
+gem "decidim", "0.25.2"
 
 gem "decidim-comments", path: "decidim-comments"
 
-gem "decidim-decidim_awesome", "~> 0.7.0"
+gem "decidim-decidim_awesome", "~> 0.8.1"
 
-## gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "0.24-stable"
-gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "024-ja"
+gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "025-ja"
 
-gem "bootsnap", "~> 1.3"
+gem "bootsnap"
 
 gem "puma", ">= 5.0.0"
 gem "uglifier", "~> 4.1"
 
 gem "faker", "~> 2.14"
 
-gem "wicked_pdf", "~> 1.4"
+gem "wicked_pdf", "~> 2.1"
 
 gem "deface"
 gem "newrelic_rpm"
 
-gem "decidim-user_extension", path: "decidim-user_extension"
+gem "omniauth-line_login", path: "omniauth-line_login"
+gem "omniauth-rails_csrf_protection"
 
-# When rails >= 5.2.5 or 6.0.3.6, you can remove this gem.
-gem "mimemagic", "~> 0.3.10"
+gem "decidim-user_extension", path: "decidim-user_extension"
 
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
   gem "figaro"
 
-  gem "decidim-dev", "0.24.3"
+  gem "decidim-dev", "0.25.2"
   gem "dotenv-rails"
   gem "factory_bot_rails"
   gem "rspec-rails"
@@ -50,8 +49,9 @@ group :development do
 end
 
 group :production do
+  gem "aws-sdk-s3", require: false
   gem "fog-aws"
-  gem "sidekiq", "5.2.7"
+  gem "sidekiq", "6.4.2"
 end
 
 gem "rubyzip", ">= 1.0.0"