diff --git a/Dockerfile b/Dockerfile index 509c3ef..a688257 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.0.7 +ARG RUBY_VERSION=3.2.9 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base # Rails app lives here @@ -19,7 +19,7 @@ FROM base as build # Install packages needed to build gems RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y build-essential git libpq-dev libvips pkg-config zip + apt-get install --no-install-recommends -y build-essential git libpq-dev libvips pkg-config zip libyaml-dev # Install application gems COPY Gemfile Gemfile.lock ./ @@ -47,7 +47,7 @@ FROM base # Install packages needed for deployment RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y curl libvips postgresql-client zip && \ + apt-get install --no-install-recommends -y curl libvips postgresql-client-17 libyaml-dev zip && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Copy built artifacts: gems, application diff --git a/Gemfile b/Gemfile index 802d901..4b3f9a1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "3.0.7" + # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.1.5", ">= 7.1.5.2" diff --git a/Gemfile.lock b/Gemfile.lock index 569092b..9099e96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,7 +149,7 @@ GEM net-smtp marcel (1.1.0) mini_mime (1.1.5) - minitest (5.26.0) + minitest (5.26.1) msgpack (1.8.0) mutex_m (0.3.0) net-imap (0.4.22) @@ -281,8 +281,5 @@ DEPENDENCIES tzinfo-data web-console -RUBY VERSION - ruby 3.0.7p220 - BUNDLED WITH 2.5.23 diff --git a/app/assets/javascript/application.js b/app/assets/javascript/application.js index ad20229..989413b 100644 --- a/app/assets/javascript/application.js +++ b/app/assets/javascript/application.js @@ -1,6 +1,4 @@ -//= require rails-ujs -//= require turbolinks -//= require_tree . + import "@hotwired/turbo-rails" import * as ActiveStorage from "@rails/activestorage" diff --git a/app/views/entries/index.html.erb b/app/views/entries/index.html.erb index 9c61a0e..3fa0377 100644 --- a/app/views/entries/index.html.erb +++ b/app/views/entries/index.html.erb @@ -162,28 +162,7 @@ - -
+ + + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7c034c8..803fce3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,41 +6,75 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> + + - + - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> - - + - - - dateFormat: "d.m.Y", - allowInput: true + - <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> + + -