Skip to content

Commit

Permalink
feat: update decidim v0.27.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ayuki-joto committed Aug 7, 2023
1 parent f5137b2 commit 2b805fe
Show file tree
Hide file tree
Showing 200 changed files with 159,605 additions and 8,537 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ pgadmin
/yarn-error.log
yarn-debug.log*
.yarn-integrity
public/sw.js
public/sw.js.map
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.0.5
48 changes: 27 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
FROM node:16.9.1-alpine as node

FROM ruby:2.7.4-alpine

RUN apk update \
&& apk add --no-cache --virtual build-dependencies \
build-base \
curl-dev \
git \
&& apk add --no-cache \
imagemagick \
postgresql-dev \
tzdata \
zip \
curl \
gcompat\
&& cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime

ENV YARN_VERSION=v1.22.5
FROM node:16.13.0-bullseye-slim as node

FROM ruby:3.0.5-slim-bullseye

RUN apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
libpq-dev \
postgresql-client \
libicu-dev
#RUN apk update \
# && apk add --no-cache --virtual build-dependencies \
# build-base \
# curl-dev \
# git \
# && apk add --no-cache \
# imagemagick \
# postgresql-dev \
# tzdata \
# zip \
# curl \
# gcompat\
# && cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime

ENV YARN_VERSION=v1.22.15

# node install
COPY --from=node /usr/local/bin/node /usr/local/bin/node
Expand All @@ -32,7 +38,7 @@ ARG RAILS_ENV="production"
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8 \
BUNDLER_JOBS=4 \
BUNDLER_VERSION=2.2.18 \
BUNDLER_VERSION=2.2.22 \
APP_HOME=/app \
RAILS_ENV=${RAILS_ENV} \
RAILS_LOG_TO_STDOUT=true \
Expand All @@ -44,7 +50,7 @@ WORKDIR $APP_HOME

COPY Gemfile Gemfile.lock ./

COPY decidim-comments /app/decidim-comments
#COPY decidim-comments /app/decidim-comments
COPY omniauth-line_login /app/omniauth-line_login
COPY decidim-user_extension /app/decidim-user_extension

Expand Down
22 changes: 11 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "decidim", "0.26.5"
gem "decidim", "0.27.3"

gem "decidim-comments", path: "decidim-comments"
# gem "decidim-comments", path: "decidim-comments"

gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "v0.9.0-2023-03-30"
gem "decidim-decidim_awesome"
#
# gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "026-ja"

gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "026-ja"

gem "decidim-polis", git: "https://github.com/takahashim/decidim-polis.git", branch: "update-0-26-5"
# gem "decidim-polis", git: "https://github.com/takahashim/decidim-polis.git", branch: "update-0-26-5"

gem "bootsnap"

gem "puma", ">= 5.0.0"
gem "puma", ">= 5.6.2"
gem "puma_worker_killer"

gem "uglifier", "~> 4.1"

gem "faker", "~> 2.14"
gem "faker", "~> 3.2"

gem "wicked_pdf", "~> 2.1"

Expand All @@ -40,19 +40,19 @@ group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "figaro"

gem "decidim-dev", "0.26.5"
gem "decidim-dev", "0.27.3"
gem "dotenv-rails"
gem "factory_bot_rails"
gem "rspec-rails"
end

group :development do
gem "letter_opener_web", "~> 1.3"
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 3.5"
gem "web-console", "~> 4.2"
end

group :production do
Expand Down
Loading

0 comments on commit 2b805fe

Please sign in to comment.