update 3.3-rc

jitingcn · Nov 22, 2023 · cf5f212 · cf5f212
1 parent 2507f5e
commit cf5f212
Show file tree

Hide file tree

Showing 10 changed files with 884 additions and 536 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,9 +45,9 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           file: builder/Dockerfile
           tags: |
-            jiting/rails-base:builder-3.2.2-slim-bookworm
-            jiting/rails-base:builder-3.2-slim-bookworm
-            jiting/rails-base:builder-3.2-slim
+            jiting/rails-base:builder-3.3.0-rc-slim-bookworm
+            jiting/rails-base:builder-3.3-rc-slim-bookworm
+            jiting/rails-base:builder-3.3-rc-slim
             jiting/rails-base:builder-slim
 
   builder_alpine:
@@ -71,12 +71,12 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           file: builder/Dockerfile-alpine
           tags: |
-            jiting/rails-base:builder-3.2.2-alpine
-            jiting/rails-base:builder-3.2-alpine
-            jiting/rails-base:builder-3.2.2
-            jiting/rails-base:builder-3.2
+            jiting/rails-base:builder-3.3.0-rc-alpine
+            jiting/rails-base:builder-3.3-rc-alpine
+            jiting/rails-base:builder-3.3.0-rc
+            jiting/rails-base:builder-3.3-rc
             jiting/rails-base:builder-alpine
-            jiting/rails-base:builder-latest
+          # jiting/rails-base:builder-latest
 
 
   production_slim:
@@ -100,9 +100,9 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           file: production/Dockerfile
           tags: |
-            jiting/rails-base:production-3.2-slim-bookworm
-            jiting/rails-base:production-3.2.2-slim-bookworm
-            jiting/rails-base:production-3.2-slim
+            jiting/rails-base:production-3.3.0-rc-slim-bookworm
+            jiting/rails-base:production-3.3.0-rc-slim-bookworm
+            jiting/rails-base:production-3.3-rc-slim
             jiting/rails-base:production-slim
 
   production_alpine:
@@ -126,9 +126,9 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           file: production/Dockerfile-alpine
           tags: |
-            jiting/rails-base:production-3.2.2-alpine
-            jiting/rails-base:production-3.2-alpine
-            jiting/rails-base:production-3.2
-            jiting/rails-base:production-3.2.2
+            jiting/rails-base:production-3.3.0-rc-alpine
+            jiting/rails-base:production-3.3-rc-alpine
+            jiting/rails-base:production-3.3-rc
+            jiting/rails-base:production-3.3.0-rc
             jiting/rails-base:production-alpine
-            jiting/rails-base:production-latest
+          # jiting/rails-base:production-latest
diff --git a/builder/.tool-versions b/builder/.tool-versions
@@ -0,0 +1,2 @@
+ruby 3.3.0-preview3
+nodejs 21.2.0
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM jiting/ruby:3.2.2-slim-bookworm
+FROM ruby:3.3-rc-slim
 LABEL maintainer="[email protected]"
 
 RUN gem install bundler

diff --git a/builder/Dockerfile-alpine b/builder/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM jiting/ruby:3.2.2-alpine
+FROM ruby:3.3-rc-alpine
 LABEL maintainer="jiting <[email protected]>"
 
 # Add basic packages

diff --git a/builder/Gemfile b/builder/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "~> 3"
 
 # Full-stack web application framework. (https://rubyonrails.org)
-gem "rails", "~> 7"
+gem "rails", "~> 7.1"
 
 # Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/] (https://github.com/ged/ruby-pg)
 gem "pg", ">= 0.18", "< 2.0"