Skip to content

Commit 186e9ae

Browse files
committed
[CHORE] Update Kamal, fix deployment, update some gems and minor things
1 parent 1b044da commit 186e9ae

File tree

11 files changed

+161
-150
lines changed

11 files changed

+161
-150
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ node_modules
5656
llm
5757

5858
/config/credentials/test.key
59+
.kamal/secrets

.kamal/hooks/post-deploy

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
echo "$KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds"
4+
5+
echo "Running migrations"
6+
7+
kamal bundle exec rails db:migrate
8+
kamal bundle exec rails db:migrate:queue
9+
kamal bundle exec rails db:migrate:cache

Dockerfile

+7-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ WORKDIR /rails
99
# Install base packages
1010
RUN apt-get update -qq && \
1111
apt-get install --no-install-recommends -y curl libjemalloc2 libsqlite3-0 \
12-
build-essential libssl-dev git pkg-config python-is-python3 libgmp-dev ca-certificates gnupg xz-utils && \
12+
build-essential libssl-dev git pkg-config python-is-python3 libgmp-dev ca-certificates gnupg xz-utils \
13+
libffi-dev libyaml-dev libreadline-dev zlib1g-dev libncurses5-dev libgdbm-dev \
14+
libc6-dev && \
1315
rm -rf /var/lib/apt/lists /var/cache/apt/archives
1416

1517
# Set production environment
@@ -40,7 +42,8 @@ FROM base AS build
4042
# Install application gems
4143
COPY Gemfile Gemfile.lock ./
4244
RUN bundle config set --local build.nokogiri --use-system-libraries && \
43-
bundle install --jobs 4 --retry 3 && \
45+
bundle config build.msgpack --with-cflags="-O2" && \
46+
bundle install --jobs 4 --retry 5 && \
4447
rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
4548

4649
# Install node modules
@@ -56,8 +59,6 @@ RUN bundle exec bootsnap precompile app/ lib/
5659
# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
5760
RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
5861

59-
# RUN yarn vite build
60-
6162
# Final stage for app image
6263
FROM base
6364

@@ -78,9 +79,5 @@ USER rails
7879
# Entrypoint prepares the database.
7980
ENTRYPOINT ["/rails/bin/docker-entrypoint"]
8081

81-
ENV HTTP_PORT="3000" \
82-
TARGET_PORT="3001"
83-
84-
# Start the server by default, this can be overwritten at runtime
85-
EXPOSE 3000
86-
CMD ["bundle", "exec", "thrust", "./bin/rails", "server"]
82+
EXPOSE 80
83+
CMD ["./bin/thrust", "./bin/rails", "server"]

Gemfile

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
source "https://rubygems.org"
22

3-
gem "rails", "8.0.0.beta1"
3+
gem "rails", "8.0.0.rc2"
44

55
gem "bootsnap", require: false
66
gem "friendly_id", "~> 5.5.1"
7-
gem "kamal", "~> 1.8.3", require: false
8-
gem "mission_control-jobs", "~> 0.3.3"
9-
gem "litestream", "~> 0.11.2"
7+
gem "kamal", "~> 2.3.0", require: false
8+
gem "thruster", "~> 0.1.8", require: false
9+
gem "mission_control-jobs", "~> 0.4.0"
10+
gem "litestream", "~> 0.12.0"
1011
gem "propshaft", "~> 1.1.0"
1112
gem "solid_cache", "~> 1.0.6"
12-
gem "solid_queue", "~> 1.0.0"
13-
gem "sqlite3", "~> 2.1.0"
13+
gem "solid_queue", "~> 1.0.1"
14+
gem "sqlite3", "~> 2.2.0"
1415
gem "stimulus-rails"
1516
gem "turbo-rails", "~> 2.0.11"
1617
gem "puma", ">= 6.4.3"
1718
gem "phlex-rails", "~> 1.2.1"
18-
gem "thruster", "~> 0.1.8"
19-
gem "vite_rails", "~> 3.0.17"
19+
gem "vite_rails", "~> 3.0.19"
2020

2121
group :development do
2222
gem "annotaterb"
@@ -28,8 +28,8 @@ end
2828

2929
group :test do
3030
gem "capybara"
31-
gem "selenium-webdriver", "~> 4.25.0"
32-
gem "mocha", "~> 2.4.5"
31+
gem "selenium-webdriver", "~> 4.26.0"
32+
gem "mocha", "~> 2.5.0"
3333
gem "simplecov", require: false
3434
gem "simplecov-tailwindcss", require: false
3535
end

0 commit comments

Comments
 (0)