From e5bbe6cf64290e9075330a18193dbcd4d7f5e738 Mon Sep 17 00:00:00 2001 From: Kevin McConnell Date: Mon, 10 Nov 2025 12:04:13 +0000 Subject: [PATCH] Remove Beamer --- Gemfile | 1 - Gemfile.lock | 11 ----------- bin/beamer | 16 ---------------- config/database.yml | 8 ++++---- config/deploy.beta.yml | 23 ----------------------- config/deploy.production.yml | 27 --------------------------- config/deploy.staging.yml | 27 --------------------------- config/deploy.yml | 1 - 8 files changed, 4 insertions(+), 110 deletions(-) delete mode 100755 bin/beamer diff --git a/Gemfile b/Gemfile index 17e33abd2..cc719e2d8 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,6 @@ gem "solid_cache", "~> 1.0" gem "solid_queue", "~> 1.2" gem "sqlite3", ">= 2.0" gem "thruster", require: false -gem "beamer-rails", "~> 0.1.0.beta4" # Features gem "bcrypt", "~> 3.1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 16162cb8b..802fe5e78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,16 +184,6 @@ GEM base64 (0.3.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) - beamer-rails (0.1.0.beta4-arm64-darwin) - sqlite3 (>= 2.0) - beamer-rails (0.1.0.beta4-arm64-linux-gnu) - sqlite3 (>= 2.0) - beamer-rails (0.1.0.beta4-x86_64-darwin) - sqlite3 (>= 2.0) - beamer-rails (0.1.0.beta4-x86_64-linux-gnu) - sqlite3 (>= 2.0) - beamer-rails (0.1.0.beta4-x86_64-linux-musl) - sqlite3 (>= 2.0) benchmark (0.5.0) bigdecimal (3.3.1) bindex (0.8.1) @@ -600,7 +590,6 @@ DEPENDENCIES autotuner aws-sdk-s3 bcrypt (~> 3.1.7) - beamer-rails (~> 0.1.0.beta4) benchmark bootsnap brakeman diff --git a/bin/beamer b/bin/beamer deleted file mode 100755 index b0b4f14e4..000000000 --- a/bin/beamer +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -# -# This file was generated by Bundler. -# -# The application 'beamer' is installed as part of a gem, and -# this file is here to facilitate running it. -# - -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) - -require "rubygems" -require "bundler/setup" - -load Gem.bin_path("beamer-rails", "beamer") diff --git a/config/database.yml b/config/database.yml index de3b50a9b..a1111d8f2 100644 --- a/config/database.yml +++ b/config/database.yml @@ -12,12 +12,12 @@ default: &default development: primary: <<: *default - adapter: <%= %w[1 true].include?(ENV["BEAMER"]&.downcase) ? "beamer" : "sqlite3" %> + adapter: sqlite3 database: storage/tenants/<%= Rails.env %>/%{tenant}/db/main.sqlite3 tenanted: true untenanted: <<: *default - adapter: <%= %w[1 true].include?(ENV["BEAMER"]&.downcase) ? "beamer" : "sqlite3" %> + adapter: sqlite3 database: storage/untenanted/development.sqlite3 migrations_paths: db/untenanted_migrate cable: @@ -49,12 +49,12 @@ test: production: &production primary: <<: *default - adapter: beamer + adapter: sqlite3 database: storage/tenants/<%= Rails.env %>/%{tenant}/db/main.sqlite3 tenanted: true untenanted: <<: *default - adapter: beamer + adapter: sqlite3 database: storage/untenanted/<%= Rails.env %>.sqlite3 migrations_paths: db/untenanted_migrate cable: diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml index 59956263e..f1db401c7 100644 --- a/config/deploy.beta.yml +++ b/config/deploy.beta.yml @@ -22,29 +22,6 @@ env: RAILS_ENV: beta accessories: - beamer: - image: basecamp/beamer:zones - registry: - server: registry.37signals.com - username: robot$harbor-bot - password: - - BASECAMP_REGISTRY_PASSWORD - labels: - otel_role: beamer - otel_service: fizzy-beamer - otel_scrape_enabled: true - options: - user: 1000 # Match the UID of the Rails app, for volume permissions - publish: - - 5001:5001 - - 9000:9000 - volumes: - - fizzy:/home/beamer - cmd: beamer run --retention=1h --metrics-port=9000 - hosts: - - fizzy-beta-app-01.sc-chi-int.37signals.com - - fizzy-beta-app-101.df-iad-int.37signals.com - load-balancer: image: basecamp/kamal-proxy:lb host: fizzy-beta-lb-01.sc-chi-int.37signals.com diff --git a/config/deploy.production.yml b/config/deploy.production.yml index b2e7b2bbb..6ae1172ce 100644 --- a/config/deploy.production.yml +++ b/config/deploy.production.yml @@ -30,33 +30,6 @@ env: RAILS_ENV: production accessories: - beamer: - image: basecamp/beamer:zones - registry: - server: registry.37signals.com - username: robot$harbor-bot - password: - - BASECAMP_REGISTRY_PASSWORD - labels: - otel_role: beamer - otel_service: fizzy-beamer - otel_scrape_enabled: true - options: - user: 1000 # Match the UID of the Rails app, for volume permissions - publish: - - 5001:5001 - - 9000:9000 - volumes: - - fizzy:/home/beamer - cmd: beamer run --retention=1h --metrics-port=9000 - hosts: - - fizzy-app-101.df-iad-int.37signals.com - - fizzy-app-102.df-iad-int.37signals.com - - fizzy-app-01.sc-chi-int.37signals.com - - fizzy-app-02.sc-chi-int.37signals.com - - fizzy-app-401.df-ams-int.37signals.com - - fizzy-app-402.df-ams-int.37signals.com - load-balancer: image: basecamp/kamal-proxy:lb hosts: diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml index e0cb7fbce..8ee71d6fa 100644 --- a/config/deploy.staging.yml +++ b/config/deploy.staging.yml @@ -26,33 +26,6 @@ env: RAILS_ENV: staging accessories: - beamer: - image: basecamp/beamer:zones - registry: - server: registry.37signals.com - username: robot$harbor-bot - password: - - BASECAMP_REGISTRY_PASSWORD - labels: - otel_role: beamer - otel_service: fizzy-beamer - otel_scrape_enabled: true - options: - user: 1000 # Match the UID of the Rails app, for volume permissions - publish: - - 5001:5001 - - 9000:9000 - volumes: - - fizzy:/home/beamer - cmd: beamer run --retention=1h --metrics-port=9000 - hosts: - - fizzy-staging-app-01.sc-chi-int.37signals.com - - fizzy-staging-app-02.sc-chi-int.37signals.com - - fizzy-staging-app-101.df-iad-int.37signals.com - - fizzy-staging-app-102.df-iad-int.37signals.com - - fizzy-staging-app-401.df-ams-int.37signals.com - - fizzy-staging-app-402.df-ams-int.37signals.com - load-balancer: image: basecamp/kamal-proxy:lb hosts: diff --git a/config/deploy.yml b/config/deploy.yml index 8fa2f5b4c..b565e5a50 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -32,4 +32,3 @@ env: aliases: console: app exec -i --reuse "bin/rails console" ssh: app exec -i --reuse /bin/bash - switch: accessory exec beamer --reuse "beamer switch --primary=<%= ENV["PRIMARY"] %>"