diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b144a05e5..ff1be89aa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Forem DEVcontainer", "dockerComposeFile": "../docker-compose.yml", "service": "devcontainer", - "runServices": ["postgres", "redis", "chrome"], + "runServices": ["postgres", "redis"], "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}", diff --git a/.ruby-version b/.ruby-version index 944880fa1..15a279981 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0 +3.3.0 diff --git a/Containerfile b/Containerfile index 36cc84124..49a9b9600 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/forem/ruby:3.2.0@sha256:fdf9539f1da2ec74043e588328f2cbac33cbb2dfddbcc499087ab6e615ffe7d4 as base +FROM ghcr.io/forem/ruby:3.3.0@sha256:9cda49a45931e9253d58f7d561221e43bd0d47676b8e75f55862ce1e9997ab5c as base FROM base as builder diff --git a/Gemfile.lock b/Gemfile.lock index 3c9258844..e9e3e932e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -342,9 +342,6 @@ GEM globalid (1.2.1) activesupport (>= 6.1) google-protobuf (3.24.0) - google-protobuf (3.24.0-arm64-darwin) - google-protobuf (3.24.0-x86_64-darwin) - google-protobuf (3.24.0-x86_64-linux) guard (2.18.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -1131,7 +1128,7 @@ DEPENDENCIES zonebie (~> 0.6.1) RUBY VERSION - ruby 3.2.0p0 + ruby 3.3.0p0 BUNDLED WITH 2.4.17 diff --git a/docker-compose.yml b/docker-compose.yml index f546be318..115a8a4a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ x-app: &app context: . args: PG_MAJOR: '13' - image: ghcr.io/forem/forem:development + image: ghcr.io/forem/forem:1.0.0-development environment: &env NODE_ENV: ${NODE_ENV:-development} RAILS_ENV: ${RAILS_ENV:-development} diff --git a/jsconfig.json b/jsconfig.json index f96d4304b..6af8acde3 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -10,5 +10,10 @@ } }, "include": ["./app/javascript/**/*"], - "exclude": ["node_modules", "public"] + "exclude": [ + "node_modules", + "public", + "app/assets/builds", + "app/javascript/storybook-static" + ] }