Skip to content

Commit

Permalink
Fix decidim design (#2766)
Browse files Browse the repository at this point in the history
  • Loading branch information
josepjaume committed Feb 19, 2018
1 parent 4e0e4f1 commit 82be733
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Dockerfile.design
Expand Up @@ -10,7 +10,12 @@ ENV RAILS_SERVE_STATIC_FILES=true

WORKDIR /code
COPY . .
RUN bundle install

# These two lines below will remove the `require` in `decidim-dev.gemspec`, which seems to be

This comment has been minimized.

Copy link
@KrzysztofMadejski

KrzysztofMadejski Apr 6, 2019

Isn't it because it is run with default bundler which now is 2.0.1.

I'd recommend to add following two lines to decidim/decidim:latest Dockerfile. (where is is placed BTW?)

# Prevent bundler warnings; ensure that the bundler version executed is >= that which created Gemfile.lock
RUN gem install bundler -v '~>1.17'
# causing issues in certain circumstances using bundler. They should not be needed at all, so
# it's worth removing them in the future and checking out they work.
RUN sed -i '/require/d' decidim-dev/decidim-dev.gemspec
RUN sed -i "s/Decidim::Dev.version/\"$(cat .decidim-version)\"/g" decidim-dev/decidim-dev.gemspec

WORKDIR /code/decidim_app-design

Expand Down
1 change: 0 additions & 1 deletion decidim_app-design/Gemfile
Expand Up @@ -8,7 +8,6 @@ gem "puma", "~> 3.7"
gem "uglifier", ">= 1.3.0"

group :development do
gem "decidim-dev", path: ".."
gem "listen", ">= 3.0.5", "< 3.2"
gem "spring-watcher-listen", "~> 2.0.0"
end
Expand Down

0 comments on commit 82be733

Please sign in to comment.