From 9af60130a3b6e966f94bc5e7f1ea819a5d4455ae Mon Sep 17 00:00:00 2001
From: Erik Hanson <erik.hanson@gmail.com>
Date: Sat, 30 Aug 2025 01:03:23 -0500
Subject: [PATCH] Migrate to Bitnamilegacy

* Migrated packages to use the Bitnamilegacy repository
* Minor updates to use any new tags and release builds
---
 CHANGELOG.md            | 5 +++++
 builders/apache.js      | 4 ++--
 docs/index.md           | 4 ++--
 examples/2.4/.lando.yml | 4 ++--
 examples/2.4/README.md  | 8 ++++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba7d09c..d91c2d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.2.0 - [August 29, 2025](https://github.com/lando/apache/releases/tag/v1.2.0)
+
+* Migrated packages to use the Bitnamilegacy repository
+* Minor updates to use any new tags and release builds
+
 ## v1.1.3 - [December 6, 2024](https://github.com/lando/apache/releases/tag/v1.1.3)
 
 * Updated the version index.md to get Docuverse page to build correctly.
diff --git a/builders/apache.js b/builders/apache.js
index 02fb3a6..33c4f41 100644
--- a/builders/apache.js
+++ b/builders/apache.js
@@ -11,7 +11,7 @@ module.exports = {
     version: '2.4',
     supported: ['2.4'],
     pinPairs: {
-      '2.4': 'bitnami/apache:2.4.41-debian-10-r52',
+      '2.4': 'bitnamilegacy/apache:2.4.65-debian-12-r2',
     },
     patchesSupported: true,
     confSrc: path.resolve(__dirname, '..', 'config'),
@@ -48,7 +48,7 @@ module.exports = {
 
       // Build the default stuff here
       const apache = {
-        image: `bitnami/apache:${options.version}`,
+        image: `bitnamilegacy/apache:${options.version}`,
         command: '/launch.sh',
         environment: options.environment,
         user: 'root',
diff --git a/docs/index.md b/docs/index.md
index f2fa4fc..0d123d6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,7 +18,7 @@ services:
 
 ## Supported versions
 
-*   **[2.4](https://hub.docker.com/r/bitnami/apache)** **(default)**
+*   **[2.4](https://hub.docker.com/r/bitnamilegacy/apache/tags?name=2.4.)** **(default)**
 *   [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides)
 
 ## Patch versions
@@ -35,5 +35,5 @@ services:
     type: apache:2.4.62
 ```
 
-But make sure you use one of the available [patch tags](https://hub.docker.com/r/bitnami/apache/tags) for the underlying image we are using.
+But make sure you use one of the available [patch tags](https://hub.docker.com/r/bitnamilegacy/apache/tags) for the underlying image we are using.
 
diff --git a/examples/2.4/.lando.yml b/examples/2.4/.lando.yml
index 9f5b8e2..24931c8 100644
--- a/examples/2.4/.lando.yml
+++ b/examples/2.4/.lando.yml
@@ -4,9 +4,9 @@ proxy:
     - landoapache.lndo.site
 services:
   defaults:
-    type: apache
+    type: apache:2.4
   patch:
-    type: apache:2.4.39
+    type: apache:2.4.64
 
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
diff --git a/examples/2.4/README.md b/examples/2.4/README.md
index 75442a2..104e726 100644
--- a/examples/2.4/README.md
+++ b/examples/2.4/README.md
@@ -19,11 +19,11 @@ lando start
 Run the following commands to validate things are rolling as they should.
 
 ```bash
-# Should return 2.4.41 for the default version
-lando exec defaults -- apachectl -V | grep 2.4.41
+# Should return 2.4.65 for the default version
+lando exec defaults -- apachectl -V | grep 2.4
 
-# Should return 2.4.39 for the patch service
-lando exec patch -- apachectl -V | grep 2.4.39
+# Should return 2.4.64 for the patch service
+lando exec patch -- apachectl -V | grep 2.4.64
 
 # Should serve from the app root by default
 lando exec defaults -- curl http://localhost | grep ROOTDIR