diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c98c9..7e96e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/nationalarchives/docker/compare/v1.24.0...HEAD) +## [Unreleased](https://github.com/nationalarchives/docker/compare/v1.25.0...HEAD) ### Added ### Changed @@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +## [1.25.0](https://github.com/nationalarchives/docker/compare/v1.24.0...v1.25.0) - 2026-10-22 + +### Security + +- Remove 7 day cooldown restriction for pip, poetry and npm - these should be applied on a per-application basis + ## [1.24.0](https://github.com/nationalarchives/docker/compare/v1.23.0...v1.24.0) - 2026-10-21 ### Changed diff --git a/docker/tna-python/Dockerfile b/docker/tna-python/Dockerfile index 49bdb02..ec8edc5 100644 --- a/docker/tna-python/Dockerfile +++ b/docker/tna-python/Dockerfile @@ -129,12 +129,12 @@ ENV NODE_ENV=production # dependency resolver of Poetry and pip to 7 # days to act as a cooldown for new releases # of packages excluding packages that we own -# and publish +# and publish - npm is set in lib/.npmrc # ========================================== -ENV COOLDOWN_PERIOD=7 -ENV POETRY_SOLVER_MIN_RELEASE_AGE="$COOLDOWN_PERIOD" \ - POETRY_SOLVER_MIN_RELEASE_AGE_EXCLUDE="tna-frontend-jinja,tna-utilities,tna-ruff-config" \ - PIP_UPLOADED_PRIOR_TO="P${COOLDOWN_PERIOD}D" +# ENV COOLDOWN_PERIOD=7 +# ENV POETRY_SOLVER_MIN_RELEASE_AGE="$COOLDOWN_PERIOD" \ +# POETRY_SOLVER_MIN_RELEASE_AGE_EXCLUDE="tna-frontend-jinja,tna-utilities,tna-ruff-config" \ +# PIP_UPLOADED_PRIOR_TO="P${COOLDOWN_PERIOD}D" # ========================================== # Ensure the `/bin/sh -c` interpreter Docker diff --git a/docker/tna-python/lib/.npmrc b/docker/tna-python/lib/.npmrc index 4d4bf17..a740212 100644 --- a/docker/tna-python/lib/.npmrc +++ b/docker/tna-python/lib/.npmrc @@ -1,3 +1,3 @@ fund=false -min-release-age=7 -min-release-age-exclude="@nationalarchives/*" \ No newline at end of file +# min-release-age=7 +# min-release-age-exclude="@nationalarchives/*" \ No newline at end of file