Merge pull request #369 from blackcandy-org/kamal-upgarde

Upgrade kamal to v1.x

Dockerfile

@@ -38,6 +38,8 @@ FROM base
 ENV LANG C.UTF-8
 ENV RAILS_ENV production
 
+LABEL service="blackcandy"
+
 RUN apk add --no-cache \
   tzdata \
   libpq \

Gemfile

@@ -89,7 +89,7 @@ group :development do
   # Help to kill N+1 queries and unused eager loading
   gem "bullet", "~> 7.1.0"
   # For deployment
-  gem "kamal", "~> 0.16.1"
+  gem "kamal", "~> 1.4.0"
 end
 
 group :test do

Gemfile.lock

@@ -79,7 +79,7 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcrypt (3.1.19)
     bcrypt_pbkdf (1.1.0)
     better_html (2.0.2)
@@ -169,8 +169,9 @@ GEM
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.6.3)
-    kamal (0.16.1)
+    kamal (1.4.0)
       activesupport (>= 7.0)
+      base64 (~> 0.2)
       bcrypt_pbkdf (~> 1.0)
       concurrent-ruby (~> 1.2)
       dotenv (~> 2.8)
@@ -218,9 +219,11 @@ GEM
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.4.0)
       net-protocol
-    net-ssh (7.2.0)
+    net-ssh (7.2.3)
     nio4r (2.5.9)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
@@ -335,8 +338,11 @@ GEM
       rails (~> 7.1)
     sqlite3 (1.7.0)
       mini_portile2 (~> 2.8.0)
-    sshkit (1.21.5)
+    sshkit (1.22.1)
+      base64
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     standard (1.25.5)
       language_server-protocol (~> 3.17.0.2)
@@ -398,7 +404,7 @@ DEPENDENCIES
   image_processing (~> 1.12)
   jbuilder (~> 2.11.5)
   jsbundling-rails (~> 1.3.0)
-  kamal (~> 0.16.1)
+  kamal (~> 1.4.0)
   listen (~> 3.8.0)
   litestack (~> 0.4.2)
   memory_profiler (~> 0.9.13)

config/deploy.yml

@@ -50,3 +50,5 @@ traefik:
     certificatesResolvers.letsencrypt.acme.storage: "/letsencrypt/acme.json"
     certificatesResolvers.letsencrypt.acme.httpchallenge: true
     certificatesResolvers.letsencrypt.acme.httpchallenge.entrypoint: web
+
+  asset_path: /app/public/assets