diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 06f2d3ce0c..238eb0ee59 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,7 +11,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT} AS base # && chmod -R $USER_UID:$USER_GID /home/vscode; \ # fi -ARG NODE_VERSION=18.14.2 +ARG NODE_VERSION=20.18.2 ENV BUNDLE_PATH="/usr/local/bundle" ENV GEM_HOME="/usr/local/bundle/gems" diff --git a/.env.example b/.env.example index 1a6e3c2400..6da8f05cf0 100644 --- a/.env.example +++ b/.env.example @@ -60,4 +60,11 @@ CI=true SOLID_QUEUE_USERNAME: SOLID_QUEUE_PASSWORD: MISSION_CONTROL_ENABLED=true -POSTMARK_API_TOKEN= "" \ No newline at end of file +POSTMARK_API_TOKEN= "" + +#Cloudfare R2 credentials +CLOUDFLARE_R2_ACCESS_KEY_ID= "" +CLOUDFLARE_R2_SECRET_ACCESS_KEY= "" +CLOUDFLARE_R2_BUCKET_NAME= "" +CLOUDFLARE_R2_REGION= "auto" +CLOUDFLARE_R2_ENDPOINT= "" \ No newline at end of file diff --git a/.github/workflows/backup.yml b/.github/workflows/backup.yml index 6026b855db..01898d1b0b 100644 --- a/.github/workflows/backup.yml +++ b/.github/workflows/backup.yml @@ -20,12 +20,14 @@ jobs: S3_BUCKET: miru-db-backup steps: - - uses: s3-actions/s3cmd@v1.2.0 + - uses: ryand56/r2-upload-action@latest with: - provider: aws - region: us-east-1 - access_key: ${{ secrets.S3_ACCESS_KEY }} - secret_key: ${{ secrets.S3_SECRET_KEY }} + r2-account-id: ${{ secrets.R2_ACCOUNT_ID }} + r2-access-key-id: ${{ secrets.R2_ACCESS_KEY }} + r2-secret-access-key: ${{ secrets.R2_SECRET_KEY }} + r2-bucket: ${{ secrets.R2_DB_BUCKET }} + source-dir: src + destination-dir: ./ - uses: superfly/flyctl-actions/setup-flyctl@master - name: Set filename run: echo "filename=db-$(date -u +"%Y-%m-%d-%H%M%S").sql" >> $GITHUB_ENV diff --git a/.github/workflows/validations.yml b/.github/workflows/validations.yml index 290071d749..eac2a7ec7b 100644 --- a/.github/workflows/validations.yml +++ b/.github/workflows/validations.yml @@ -55,7 +55,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v1 with: - node-version: 18.14.2 + node-version: 20.18.2 - name: Find yarn cache location id: yarn-cache run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/.node-version b/.node-version index e06fc80f80..0254b1e633 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.14.2 \ No newline at end of file +20.18.2 diff --git a/.nvmrc b/.nvmrc index 72e4a483c0..0254b1e633 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.14.2 +20.18.2 diff --git a/Dockerfile.local b/Dockerfile.local index f06fa0b2a6..fd43cf991b 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,7 +1,7 @@ #syntax=docker/dockerfile:1 FROM ruby:3.2.4-slim AS base -ARG NODE_VERSION=18.14.2 +ARG NODE_VERSION=20.18.2 ENV BUNDLE_PATH="/usr/local/bundle" ENV GEM_HOME="/usr/local/bundle/gems" diff --git a/Dockerfile.test b/Dockerfile.test index f3a27c3a9c..c92798c219 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,7 +1,7 @@ #syntax=docker/dockerfile:1 FROM ruby:3.2.4-slim AS base -ARG NODE_VERSION=18.14.2 +ARG NODE_VERSION=20.18.2 RUN mkdir /app WORKDIR /app diff --git a/config/environments/production.rb b/config/environments/production.rb index d8759cd46d..96a01ee65f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -39,7 +39,7 @@ # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :amazon + config.active_storage.service = :cloudfare # Mount Action Cable outside main process or domain. # config.action_cable.mount_path = nil diff --git a/config/storage.yml b/config/storage.yml index d7d6fa9253..b1915df4e8 100644 --- a/config/storage.yml +++ b/config/storage.yml @@ -7,12 +7,13 @@ local: root: <%= Rails.root.join("storage") %> # Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) -amazon: +cloudfare: service: S3 - access_key_id: <%= ENV.fetch('AWS_ACCESS_KEY_ID', '') %> - secret_access_key: <%=ENV.fetch('AWS_SECRET_ACCESS_ID', '')%> - region: <%= ENV.fetch('AWS_REGION', '') %> - bucket: <%= ENV.fetch('AWS_S3_BUCKET_NAME', '') %> + access_key_id: <%= ENV.fetch('CLOUDFLARE_R2_ACCESS_KEY_ID', '') %> + secret_access_key: <%= ENV.fetch('CLOUDFLARE_R2_SECRET_ACCESS_KEY', '') %> + region: <%= ENV.fetch('CLOUDFLARE_R2_REGION', '') %> + bucket: <%= ENV.fetch('CLOUDFLARE_R2_BUCKET_NAME', '') %> + endpoint: <%= ENV.fetch('CLOUDFLARE_R2_ENDPOINT', '') %> # Remember not to checkin your GCS keyfile to a repository # google: # service: GCS diff --git a/docs/.node-version b/docs/.node-version index 67a228a447..0254b1e633 100644 --- a/docs/.node-version +++ b/docs/.node-version @@ -1 +1 @@ -18.18.0 \ No newline at end of file +20.18.2