From b44fcb8fd953a2154831eb2c6c3bbd8b7216580f Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Tue, 14 Apr 2026 16:03:41 +0100 Subject: [PATCH 1/2] CLDC-4430: make dev containers mac compatible (#3309) --- aws-devcontainer/.devcontainer/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aws-devcontainer/.devcontainer/Dockerfile b/aws-devcontainer/.devcontainer/Dockerfile index 3fd23c4d4..82f969b4d 100644 --- a/aws-devcontainer/.devcontainer/Dockerfile +++ b/aws-devcontainer/.devcontainer/Dockerfile @@ -1,7 +1,13 @@ FROM homebrew/brew RUN brew install aws-vault && brew install awscli -RUN curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "session-manager-plugin.deb" && sudo dpkg -i session-manager-plugin.deb +RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \ + ARCH="ubuntu_arm64"; \ + else \ + ARCH="ubuntu_64bit"; \ + fi && \ + curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/${ARCH}/session-manager-plugin.deb" -o "session-manager-plugin.deb" && \ + sudo dpkg -i session-manager-plugin.deb ENV AWS_VAULT_BACKEND=file ENV AWS_VAULT_FILE_DIR=./vault From 5d45e04d0d2012f68574e45a31c5e220c97ebc68 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Tue, 14 Apr 2026 16:13:43 +0100 Subject: [PATCH 2/2] CLDC-4406: Update rake name to delete old logs (#3311) considering this is a very dangerous script best not to leave the name slightly ambiguous (since it deletes from the given year and before) --- ...ear.rake => delete_logs_in_collection_year_and_earlier.rake} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename lib/tasks/{delete_logs_before_year.rake => delete_logs_in_collection_year_and_earlier.rake} (92%) diff --git a/lib/tasks/delete_logs_before_year.rake b/lib/tasks/delete_logs_in_collection_year_and_earlier.rake similarity index 92% rename from lib/tasks/delete_logs_before_year.rake rename to lib/tasks/delete_logs_in_collection_year_and_earlier.rake index 1343ed4ae..b5ed4573b 100644 --- a/lib/tasks/delete_logs_before_year.rake +++ b/lib/tasks/delete_logs_in_collection_year_and_earlier.rake @@ -1,5 +1,5 @@ desc "Deletes all logs in a given collection year and earlier. Note that this operation is PERMANENT and this will bypass callbacks/paper trail. Use only as instructed in a yearly cleanup task." -task :delete_logs_before_year, %i[year] => :environment do |_task, args| +task :delete_logs_in_collection_year_and_earlier, %i[year] => :environment do |_task, args| year = args[:year].to_i if year < 2020