Skip to content

Commit f4ea627

Browse files
committed
- minor fixes
1 parent d5731a5 commit f4ea627

5 files changed

Lines changed: 23 additions & 14 deletions

File tree

example/.dockerdev/Aptfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
# We might need an editor to work with credentials
22
vim
3+
# Application dependencies
4+
sqlite3
5+
libvips
6+
# Claude
7+
bubblewrap
8+
socat

example/.dockerdev/compose.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ x-app: &app
99
working_dir: ${PWD}
1010
environment: &env
1111
NODE_ENV: ${NODE_ENV:-development}
12-
RAILS_ENV: ${RAILS_ENV:-development}
12+
RAILS_ENV: ${RAILS_ENV:-}
1313
tmpfs:
1414
- /tmp
1515
- /${PWD}/tmp/pids
@@ -66,6 +66,9 @@ services:
6666
condition: service_started
6767
sidekiq:
6868
condition: service_started
69+
# # Uncomment these lines to always run Vite dev server
70+
# vite:
71+
# condition: service_started
6972

7073
sidekiq:
7174
<<: *backend
@@ -98,21 +101,20 @@ services:
98101
timeout: 3s
99102
retries: 30
100103

101-
webpacker:
102-
<<: *app
103-
command: bundle exec ./bin/webpack-dev-server
104-
ports:
105-
- '3035:3035'
104+
vite:
105+
<<: *backend
106+
command: ./bin/vite dev
106107
volumes:
107-
- ..:/${PWD}/cached
108+
- ${PWD}:/${PWD}:cached
108109
- bundle:/usr/local/bundle
109110
- node_modules:/${PWD}/node_modules
110-
- packs:/${PWD}/public/packs
111-
- packs-test:/${PWD}/public/packs-test
111+
- vite_dev:/${PWD}/public/vite-dev
112+
- vite_test:/${PWD}/public/vite-test
112113
environment:
113-
<<: *env
114-
WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
115-
YARN_CACHE_FOLDER: /${PWD}/node_modules/.yarn-cache
114+
<<: *backend_environment
115+
VITE_RUBY_HOST: 0.0.0.0 # bind to container
116+
ports:
117+
- "3036:3036"
116118

117119
volumes:
118120
bundle:

example/dip.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ interaction:
8080
provision:
8181
- '[[ "$RESET_DOCKER" == "true" ]] && echo "Re-creating the Docker env from scratch..." && dip compose down --volumes || echo "Re-provisioning the Docker env..."'
8282
- dip compose up -d postgres redis
83+
- (test -f .dockerdev/.claude.json) || (cp .dockerdev/.claude.json.example .dockerdev/.claude.json)
8384
- dip bundle check || dip bundle install
8485
- dip rails db:prepare
8586
- dip rails db:test:prepare

template/_aptfile.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
end
1414

1515
if gemspecs.key?("ruby-vips")
16-
deps << "libvips"
16+
deps << "libvips-dev"
1717
end
1818

1919
say "Here is the list of system packages we're going to install:", :blue

template/compose.yml.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ x-app: &app
1818
<% if node_version %>
1919
NODE_ENV: ${NODE_ENV:-development}
2020
<% end %>
21-
RAILS_ENV: ${RAILS_ENV:-development}
21+
RAILS_ENV: ${RAILS_ENV:-}
2222
tmpfs:
2323
- /tmp
2424
- ${PWD}/tmp/pids

0 commit comments

Comments
 (0)