From bd0101edc8bea81d4312e6a571e3a3f68349204c Mon Sep 17 00:00:00 2001 From: "tobias.saunders" Date: Wed, 19 Jun 2024 16:03:39 +0100 Subject: [PATCH] Started to update and write dockers files to make this run --- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile | 2 +- Gemfile.lock | 111 +++++++++++++++++++++++++++++--------------------- 4 files changed, 67 insertions(+), 50 deletions(-) diff --git a/.ruby-version b/.ruby-version index a4412fa..b347b11 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.8 +3.2.3 diff --git a/Dockerfile b/Dockerfile index 65d0f02..8cc470f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY ./Gemfile /usr/src/gems COPY ./Gemfile.lock /usr/src/gems COPY ./.ruby-version /usr/src/gems -RUN apt-get update && apt-get install -y nodejs +RUN apt-get update && apt-get install -y nodejs && apt-get install -y npm RUN bundle config set force_ruby_platform true diff --git a/Gemfile b/Gemfile index 9afa3c1..cc43e62 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw] # Windows does not come with time zone data gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby] -gem 'govuk_tech_docs' +gem 'govuk_tech_docs', git: 'https://github.com/alphagov/tech-docs-gem.git', branch: 'ga4-tag-manager' gem 'middleman-gh-pages' diff --git a/Gemfile.lock b/Gemfile.lock index be6b974..b8618d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,32 @@ +GIT + remote: https://github.com/alphagov/tech-docs-gem.git + revision: b4afd671d727b13318100957ff63ed53c36011fe + branch: ga4-tag-manager + specs: + govuk_tech_docs (3.5.0) + autoprefixer-rails (~> 10.2) + base64 + bigdecimal + chronic (~> 0.10.2) + csv + haml (~> 6.0) + middleman (~> 4.0) + middleman-autoprefixer (~> 2.10) + middleman-compass (~> 4.0) + middleman-livereload + middleman-search-gds + middleman-sprockets (~> 4.0.0) + middleman-syntax (~> 3.4) + mutex_m + nokogiri + openapi3_parser (~> 0.9.0) + redcarpet (~> 3.6) + GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.1) - activesupport (7.0.7.2) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -15,9 +39,10 @@ GEM fiber-annotation io-event (~> 1.5, >= 1.5.1) timers (~> 4.1) - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) - backports (3.23.0) + backports (3.25.0) + base64 (0.2.0) bigdecimal (3.1.8) chronic (0.10.2) chunky_png (1.4.0) @@ -38,13 +63,14 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.3) console (1.25.2) fiber-annotation fiber-local (~> 1.1) json contracts (0.16.1) - dotenv (2.8.1) + csv (3.3.0) + dotenv (3.1.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -52,29 +78,17 @@ GEM ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.9.1) fast_blank (1.0.1) - fastimage (2.2.6) + fastimage (2.3.1) ffi (1.15.5) fiber-annotation (0.2.0) fiber-local (1.1.0) fiber-storage fiber-storage (0.1.1) - govuk_tech_docs (3.3.0) - autoprefixer-rails (~> 10.2) - chronic (~> 0.10.2) - middleman (~> 4.0) - middleman-autoprefixer (~> 2.10.0) - middleman-compass (>= 4.0.0) - middleman-livereload - middleman-search-gds - middleman-sprockets (~> 4.0.0) - middleman-syntax (~> 3.2.0) - nokogiri - openapi3_parser (~> 0.9.0) - redcarpet (~> 3.5.1) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) @@ -96,30 +110,30 @@ GEM json (2.7.2) kramdown (2.4.0) rexml - listen (3.7.1) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.4.3) + middleman (4.5.1) coffee-script (~> 2.2) - haml (>= 4.0.5, < 6.0) + haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.4.3) - middleman-core (= 4.4.3) + middleman-cli (= 4.5.1) + middleman-core (= 4.5.1) middleman-autoprefixer (2.10.0) autoprefixer-rails (>= 9.1.4) middleman-core (>= 3.3.3) - middleman-cli (4.4.3) - thor (>= 0.17.0, < 2.0) + middleman-cli (4.5.1) + thor (>= 0.17.0, < 1.3.0) middleman-compass (4.0.1) compass (>= 1.0.0, < 2.0.0) middleman-core (>= 4.0.0) - middleman-core (4.4.3) + middleman-core (4.5.1) activesupport (>= 6.1, < 7.1) addressable (~> 2.4) backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13) + contracts (~> 0.13, < 0.17) dotenv erubis execjs (~> 2.0) @@ -145,30 +159,31 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-search-gds (0.11.1) + middleman-search-gds (0.11.2) execjs (~> 2.6) middleman-core (>= 3.2) nokogiri (~> 1.6) middleman-sprockets (4.0.0) middleman-core (~> 4.0) sprockets (>= 3.0) - middleman-syntax (3.2.0) + middleman-syntax (3.4.0) middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.8.0) - minitest (5.19.0) + minitest (5.24.0) multi_json (1.15.0) + mutex_m (0.2.0) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) openapi3_parser (0.9.2) commonmarker (~> 0.17) - padrino-helpers (0.15.1) + padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.1) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.15.1) - parallel (1.22.1) + padrino-support (0.15.3) + parallel (1.25.1) parslet (2.0.0) pdf-reader (2.12.0) Ascii85 (~> 1.0) @@ -178,27 +193,29 @@ GEM ttfunk public_suffix (5.0.1) racc (1.6.1) - rack (2.2.6.4) + rack (2.2.9) rack-livereload (0.3.17) rack rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - redcarpet (3.5.1) - rexml (3.2.5) + redcarpet (3.6.0) + rexml (3.3.0) + strscan rouge (3.30.0) ruby-rc4 (0.1.5) sass (3.4.25) sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - temple (0.9.1) - thor (1.2.1) + strscan (3.1.0) + temple (0.10.3) + thor (1.2.2) tilt (2.0.11) timers (4.3.5) toml (0.3.0) @@ -211,7 +228,7 @@ GEM concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - webrick (1.7.0) + webrick (1.8.1) yell (2.2.2) zeitwerk (2.6.14) @@ -219,7 +236,7 @@ PLATFORMS ruby DEPENDENCIES - govuk_tech_docs + govuk_tech_docs! html-proofer middleman-gh-pages tzinfo-data