diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index e1a0001..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: 2 -updates: - - package-ecosystem: bundler - directory: / - schedule: - interval: daily - - package-ecosystem: github-actions - directory: / - schedule: - interval: daily diff --git a/Dockerfile b/Dockerfile index 9906386..8bee549 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,10 @@ # check=error=true # This Dockerfile is designed for production, not development. Use with Kamal or build'n'run by hand: -# docker build --tag fleetfocus-api --build-arg RUBY_VERSION="$(cat .ruby-version)" . +# docker build --tag fleetfocus-api . # docker run --interactive --tty --publish 80:80 --env MASTER_KEY="$(cat config/fleetfocus-api.key)" fleetfocus-api -# Make sure RUBY_VERSION matches the Ruby version in .ruby-version -ARG RUBY_VERSION=OVERRIDE_ME -FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base +FROM ruby:3.4.8-slim AS base # App lives here WORKDIR /app diff --git a/Gemfile b/Gemfile index 6e00acf..12c872d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby file: '.ruby-version' +ruby '3.4.8' gem 'activesupport', require: 'active_support/all' gem 'exception_notification' diff --git a/config/deploy.yml b/config/deploy.yml index ef88a14..22a7985 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -1,8 +1,4 @@ <% - def project_root - KAMAL.configured?[:config_file].join('../..') - end - def user_for(host) Net::SSH::Config.for(host).fetch(:user, ENV.fetch('USER', nil)) end @@ -20,8 +16,6 @@ registry: server: localhost:5555 builder: arch: amd64 - args: - RUBY_VERSION: <%= project_root.join('.ruby-version').read.strip %> env: clear: TZ: 'America/New_York' diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..6c115de --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "github>umts/renovate-config:base" + ] +}