Skip to content

Commit

Permalink
Try bundle install update before start.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
malparty committed Jun 6, 2023
1 parent b0df847 commit f78291b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .template/addons/docker/Dockerfile.tt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ RUN mkdir -p /usr/local/etc \
COPY tmp/docker ./

# Install Ruby gems
# TODO: REMOVE bundle lock --add-platform x86_64-linux && \ if working without...
RUN gem install bundler && \
bundle lock --add-platform x86_64-linux && \
bundle config set jobs $BUNDLE_JOBS && \
bundle config set path $BUNDLE_PATH && \
if [ "$BUILD_ENV" = "production" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test_template:
if [ $(VARIANT) = web ]; then \
bundle exec rspec --pattern="${base_spec}, ${web_spec}, ${base_addon_spec}, ${web_addon_spec}" --format progress; \
elif [ $(VARIANT) = api ]; then \
bundle exec rspec --pattern="${base_spec}, ${api_spec}, ${base_addon_spec}, ${api_addon_spec}" --format progress; \
bundle exec rspec --pattern="${base_spec}, ${api_spec}, ${base_addon_spec}, ${api_addon_spec}"; \
fi;

cleanup:
Expand Down
3 changes: 3 additions & 0 deletions bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ if [ -f tmp/pids/server.pid ]; then
rm -f tmp/pids/server.pid
fi

bundle install
bundle update

# Run pending migrations (if any) and start rails
bundle exec rails db:migrate
bundle exec rails s -p $PORT -b 0.0.0.0

0 comments on commit f78291b

Please sign in to comment.