Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion image/discourse_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ USER discourse
# Warm global bundle cache, then delete the compressed `cache/` versions (`/gem/` are enough)
RUN --mount=type=bind,src=/repo,from=repo-fetcher,target=/tmp/discourse-clone,readwrite \
cd /tmp/discourse-clone \
&& bundle install --deployment \
&& bundle config set deployment && \
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this not be bundle config set deployment true as per the error message?

&& bundle install \
&& rm -rf /home/discourse/.bundle/gems/ruby/*/cache/*

# Warm global yarn cache
Expand Down
2 changes: 1 addition & 1 deletion templates/import/mbox.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ hooks:
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libsqlite3-dev
- echo "gem 'sqlite3'" >> Gemfile
- su discourse -c 'bundle config unset deployment'
- su discourse -c 'bundle install --no-deployment --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- su discourse -c 'bundle install --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
2 changes: 1 addition & 1 deletion templates/import/mssql-dep.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ hooks:
cmd:
- echo "gem 'tiny_tds'" >> Gemfile
- su discourse -c 'bundle config unset deployment'
- su discourse -c 'bundle install --no-deployment --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- su discourse -c 'bundle install --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
2 changes: 1 addition & 1 deletion templates/import/mysql-dep.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ hooks:
- echo "gem 'mysql2'" >> Gemfile
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y libmariadb-dev
- su discourse -c 'bundle config unset deployment'
- su discourse -c 'bundle install --no-deployment --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- su discourse -c 'bundle install --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
2 changes: 1 addition & 1 deletion templates/import/phpbb3.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ hooks:
- echo "gem 'mysql2'" >> Gemfile
- echo "gem 'ruby-bbcode-to-md', :github => 'nlalonde/ruby-bbcode-to-md'" >> Gemfile
- su discourse -c 'bundle config unset deployment'
- su discourse -c 'bundle install --no-deployment --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- su discourse -c 'bundle install --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
2 changes: 1 addition & 1 deletion templates/import/vanilla.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ hooks:
- echo "gem 'mysql2'" >> Gemfile
- echo "gem 'ruby-bbcode-to-md', :github => 'nlalonde/ruby-bbcode-to-md'" >> Gemfile
- su discourse -c 'bundle config unset deployment'
- su discourse -c 'bundle install --no-deployment --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- su discourse -c 'bundle install --path vendor/bundle --jobs $(($(nproc) - 1)) --without test development'
- service mariadb start
# imports the DB into mysql
- sh /usr/local/bin/import_flarum_test.sh
Loading