Skip to content

Commit

Permalink
Ci docker compose fix (#966)
Browse files Browse the repository at this point in the history
* dev: remove docker volume for bundle_dir

ruby gems will now be used directly from the image; incremental local changes will not persist and `bundle install` will no longer be run at startup. changes to the gemfile will require the image to be rebuilt

* ci: install docker-compose
  • Loading branch information
sourcefilter authored Oct 7, 2024
1 parent 3962be1 commit d8b5b5c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- name: Install Docker Compose
run: |
sudo apt-get update
sudo apt-get install -y docker-compose
- name: Login to DockerHub
uses: docker/login-action@f3364599c6aa293cdc2b8391b1b56d0c30e45c8a
with:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ services:
volumes:
- .:/californica
- ./data:/opt/data
- bundle_dir:/usr/local/bundle
- californica_tmp:/californica/tmp
- derivatives:/opt/derivatives
- californica_log:/californica/log
Expand All @@ -44,7 +43,6 @@ services:
volumes:
- .:/californica
- ./data:/opt/data
- bundle_dir:/usr/local/bundle
- californica_log:/californica/log
- californica_tmp:/californica/tmp
- derivatives:/opt/derivatives
Expand Down
2 changes: 1 addition & 1 deletion docker/start-app.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

bundle check || bundle install
# bundle check || bundle install

find . -name *.pid -delete
bundle exec rails s -b 0.0.0.0

0 comments on commit d8b5b5c

Please sign in to comment.