From d07480ed9390d8b4c4fe19a52ded8105ee97fca1 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.com>
Date: Thu, 10 Dec 2020 15:51:01 +1100
Subject: [PATCH] initial re-repo

---
 docs/docker-images/elasticsearch.md          |  4 +-
 docs/docker-images/mariadb/README.md         |  4 +-
 docs/docker-images/mariadb/mariadb-drupal.md |  2 +-
 docs/docker-images/mongodb.md                |  2 +-
 docs/docker-images/nginx/README.md           |  2 +-
 docs/docker-images/nginx/nginx-drupal.md     |  2 +-
 docs/docker-images/php-cli/README.md         | 12 ++++-
 docs/docker-images/php-cli/php-cli-drupal.md | 13 +++++-
 docs/docker-images/php-fpm.md                | 21 ++++-----
 docs/docker-images/postgres.md               |  6 ++-
 docs/docker-images/rabbitmq.md               |  2 +-
 docs/docker-images/redis/README.md           |  7 +--
 docs/docker-images/redis/redis-persistent.md |  2 +-
 docs/docker-images/solr/README.md            |  8 ++--
 docs/docker-images/solr/solr-drupal.md       | 11 ++---
 docs/docker-images/varnish/README.md         |  2 +-
 docs/docker-images/varnish/varnish-drupal.md |  2 +-
 docs/drupal/services/solr.md                 |  2 +-
 docs/drupal/services/varnish.md              |  4 +-
 docs/using-lagoon-the-basics/index.md        | 46 ++++++++++----------
 20 files changed, 91 insertions(+), 63 deletions(-)

diff --git a/docs/docker-images/elasticsearch.md b/docs/docker-images/elasticsearch.md
index ecee7db0df..016f6b3231 100644
--- a/docs/docker-images/elasticsearch.md
+++ b/docs/docker-images/elasticsearch.md
@@ -6,8 +6,8 @@
 
 ## Supported versions
 
-* 6.8 [\[Dockerfile\]](https://github.com/amazeeio/lagoon/blob/master/images/elasticsearch/Dockerfile6)
-* 7.6 [\[Dockerfile\]](https://github.com/amazeeio/lagoon/blob/master/images/elasticsearch/Dockerfile7)
+* 6 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/elasticsearch/6.Dockerfile)
+* 7 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/elasticsearch/7.Dockerfile)
 
 ## Known issues
 
diff --git a/docs/docker-images/mariadb/README.md b/docs/docker-images/mariadb/README.md
index 7c30b54f0b..36c2c646c7 100644
--- a/docs/docker-images/mariadb/README.md
+++ b/docs/docker-images/mariadb/README.md
@@ -2,7 +2,7 @@
 
 MariaDB is the open source successor to MySQL.
 
-The [Lagoon `MariaDB` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/mariadb/Dockerfile). Based on the official packages `mariadb` and `mariadb-client` provided by the `alpine:3.8` image.
+The [Lagoon `MariaDB` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/Dockerfile). Based on the official packages `mariadb` and `mariadb-client` provided by the `alpine:3.8` image.
 
 This Dockerfile is intended to be used to set up a standalone MariaDB database server.
 
@@ -16,7 +16,7 @@ This image is prepared to be used on Lagoon. There are therefore some things alr
 ## Included tools
 
 * [`mysqltuner.pl`](https://github.com/major/MySQLTuner-perl) - Perl script useful for database parameter tuning.
-* [`mysql-backup.sh`](https://github.com/amazeeio/lagoon/blob/master/images/mariadb/mysql-backup.sh) - Script for automating the daily MySQL backups on development environment.
+* [`mysql-backup.sh`](https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb/mysql-backup.sh) - Script for automating the daily MySQL backups on development environment.
 * [`pwgen`](https://linux.die.net/man/1/pwgen) - Utility to generate random and complex passwords.
 
 ## Included `my.cnf` configuration file
diff --git a/docs/docker-images/mariadb/mariadb-drupal.md b/docs/docker-images/mariadb/mariadb-drupal.md
index ca0ef9bc62..54c12d4093 100644
--- a/docs/docker-images/mariadb/mariadb-drupal.md
+++ b/docs/docker-images/mariadb/mariadb-drupal.md
@@ -2,7 +2,7 @@
 
 MariaDB is the open source successor to MySQL.
 
-The [Lagoon `mariadb-drupal` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/mariadb-drupal/Dockerfile) is a customized [`mariadb` image](./) to use within Drupal projects in Lagoon. It differs from the `mariadb` image only for initial database setup, made by some environment variables:
+The [Lagoon `mariadb-drupal` Docker image](* 11 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal/Dockerfile) is a customized [`mariadb` image](./) to use within Drupal projects in Lagoon. It differs from the `mariadb` image only for initial database setup, made by some environment variables:
 
 | Environment Variable | Default | Description |
 | :--- | :--- | :--- |
diff --git a/docs/docker-images/mongodb.md b/docs/docker-images/mongodb.md
index 4e2aa3089a..72211fce50 100644
--- a/docs/docker-images/mongodb.md
+++ b/docs/docker-images/mongodb.md
@@ -4,7 +4,7 @@
 >
 > * from [mongodb.com](https://www.mongodb.com/)
 
-[Lagoon `MongoDB` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/mongo/Dockerfile). Based on the official package `mongodb` provided by the `alpine:3.8` image.
+[Lagoon `MongoDB` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/mongo/Dockerfile). Based on the official package `mongodb` provided by the `alpine:3.8` image.
 
 This Dockerfile is intended to be used to set up a standalone MongoDB database server.
 
diff --git a/docs/docker-images/nginx/README.md b/docs/docker-images/nginx/README.md
index 9aeb6b11a9..79d01e5118 100644
--- a/docs/docker-images/nginx/README.md
+++ b/docs/docker-images/nginx/README.md
@@ -1,6 +1,6 @@
 # NGINX
 
-The [Lagoon `nginx` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/nginx/Dockerfile). Based on the official [`openresty/openresty` images](https://hub.docker.com/r/openresty/openresty/).
+The [Lagoon `nginx` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/nginx/Dockerfile). Based on the official [`openresty/openresty` images](https://hub.docker.com/r/openresty/openresty/).
 
 This Dockerfile is intended to be used as a base for any web servers within Lagoon.
 
diff --git a/docs/docker-images/nginx/nginx-drupal.md b/docs/docker-images/nginx/nginx-drupal.md
index b3e32830f4..4c0c70f746 100644
--- a/docs/docker-images/nginx/nginx-drupal.md
+++ b/docs/docker-images/nginx/nginx-drupal.md
@@ -1,6 +1,6 @@
 # NGINX-Drupal
 
-The [Lagoon `nginx-drupal` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/nginx-drupal/Dockerfile). Optimized to work with Drupal. Based on [Lagoon `nginx` image](./).
+The [Lagoon `nginx-drupal` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/nginx-drupal/Dockerfile). Optimized to work with Drupal. Based on [Lagoon `nginx` image](./).
 
 ## Lagoon adaptions
 
diff --git a/docs/docker-images/php-cli/README.md b/docs/docker-images/php-cli/README.md
index f8ecdd0656..47bae86fe6 100644
--- a/docs/docker-images/php-cli/README.md
+++ b/docs/docker-images/php-cli/README.md
@@ -1,6 +1,6 @@
 # PHP-CLI
 
-The [Lagoon `php-cli` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/php/cli/Dockerfile). Based on [Lagoon `php-fpm` image](../php-fpm.md), it has all the needed command line tools for daily operations.
+The [Lagoon `php-cli` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli). Based on [Lagoon `php-fpm` image](../php-fpm.md), it has all the needed command line tools for daily operations.
 
 Containers \(or pods\) started from `cli` images are responsible for building code for Composer or Node.js based projects.
 
@@ -10,6 +10,16 @@ The image also contains database `cli`s for both MariaDB and PostgreSQL.
 This Dockerfile is intended to be used as a base for any `cli` needs within Lagoon.
 {% endhint %}
 
+## Supported versions
+
+* 5.6 \(available for compatibility, no longer officially supported\)
+* 7.0 \(available for compatibility, no longer officially supported\)
+* 7.2 \(available for compatibility, no longer officially supported\)
+* 7.3 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli/7.3.Dockerfile)
+* 7.4 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli/7.4.Dockerfile)
+* 8.0 \(coming soon\)
+
+All PHP versions use their own Dockerfiles.
 ## Lagoon adaptions
 
 This image is prepared to be used on Lagoon. There are therefore some things already done:
diff --git a/docs/docker-images/php-cli/php-cli-drupal.md b/docs/docker-images/php-cli/php-cli-drupal.md
index 062f21ab89..71a5a3d50b 100644
--- a/docs/docker-images/php-cli/php-cli-drupal.md
+++ b/docs/docker-images/php-cli/php-cli-drupal.md
@@ -1,11 +1,22 @@
 # PHP-CLI-Drupal
 
-The [Lagoon `php-cli-drupal` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/php/cli-drupal/Dockerfile) is optimized to work with Drupal. It is based on the [Lagoon `php-cli` image](./), and has all the command line tools needed for the daily maintenance of a Drupal website:
+The [Lagoon `php-cli-drupal` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal) is optimized to work with Drupal. It is based on the [Lagoon `php-cli` image](./), and has all the command line tools needed for the daily maintenance of a Drupal website:
 
 * `drush`
 * `drupal console`
 * `drush launcher` \(which will fallback to Drush 8 if there is no site installed Drush found\)
 
+## Supported versions
+
+* 5.6 \(available for compatibility, no longer officially supported\)
+* 7.0 \(available for compatibility, no longer officially supported\)
+* 7.2 \(available for compatibility, no longer officially supported\)
+* 7.3 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal/7.3.Dockerfile)
+* 7.4 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal/7.4.Dockerfile)
+* 8.0 \(coming soon\)
+
+All PHP versions use their own Dockerfiles.
+
 ## Lagoon adaptions
 
 This image is prepared to be used on Lagoon. There are therefore some things already done:
diff --git a/docs/docker-images/php-fpm.md b/docs/docker-images/php-fpm.md
index e5fa41372b..0ae4afcd83 100644
--- a/docs/docker-images/php-fpm.md
+++ b/docs/docker-images/php-fpm.md
@@ -1,6 +1,6 @@
 # PHP-FPM
 
-The [Lagoon `php-fpm` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/php/fpm/Dockerfile). Based on [the official PHP Alpine images](https://hub.docker.com/_/php/).
+The [Lagoon `php-fpm` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm). Based on [the official PHP Alpine images](https://hub.docker.com/_/php/).
 
 > _PHP-FPM \(FastCGI Process Manager\) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size, especially busier sites._
 >
@@ -12,15 +12,16 @@ The [Lagoon `php-fpm` Docker image](https://github.com/amazeeio/lagoon/blob/mast
 This Dockerfile is intended to be used as a base for any `PHP` needs within Lagoon. This image itself does not create a web server, rather a `php-fpm` fastcgi listener. You may need to adapt the `php-fpm` pool config.
 {% endhint %}
 
-## Supported Versions
+## Supported versions
 
-* 5.6 \(available for compatibility, not officially supported\)
-* 7.0 \(available for compatibility, not officially supported\)
-* 7.2
-* 7.3
-* 7.4
+* 5.6 \(available for compatibility, no longer officially supported\)
+* 7.0 \(available for compatibility, no longer officially supported\)
+* 7.2 \(available for compatibility, no longer officially supported\)
+* 7.3 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/7.3.Dockerfile)
+* 7.4 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/7.4.Dockerfile)
+* 8.0 \(coming soon\)
 
-All PHP versions use the same Dockerfile.
+All PHP versions use their own Dockerfiles.
 
 ## Lagoon adaptions
 
@@ -28,7 +29,7 @@ This image is prepared to be used on Lagoon. There are therefore some things are
 
 * Folder permissions are automatically adapted with [`fix-permissions`](https://github.com/sclorg/s2i-base-container/blob/master/core/root/usr/bin/fix-permissions), so this image will work with a random user.
 * The `/usr/local/etc/php/php.ini` and `/usr/local/etc/php-fpm.conf`, plus all files within `/usr/local/etc/php-fpm.d/` , are parsed through [`envplate`](https://github.com/kreuzwerker/envplate) with a container-entrypoint.
-* See the [Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/php/fpm/Dockerfile) for installed `PHP` extensions.
+* See the [Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/7.4.Dockerfile) for installed `PHP` extensions.
 * To install further extensions, extend your Dockerfile from this image. Install extensions according to the docs, under the heading[ How to install more PHP extensions.](https://github.com/docker-library/docs/blob/master/php/README.md#how-to-install-more-php-extensions)
 
 ## Included PHP config.
@@ -66,7 +67,7 @@ Also, `php-fpm` error logging happens in `stderr`.
 
 ## default fpm-pool
 
-This image is shipped with an `fpm-pool` config \([`php-fpm.d/www.conf`](https://github.com/amazeeio/lagoon/blob/master/images/php/fpm/php-fpm.d/www.conf)\) that creates an `fpm-pool` and listens on port 9000. This is because we try to provide an image which already covers most needs for PHP, so you don't need to create your own. You are welcome to do so if you like, though!
+This image is shipped with an `fpm-pool` config \([`php-fpm.d/www.conf`](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm/php-fpm.d/www.conf)\) that creates an `fpm-pool` and listens on port 9000. This is because we try to provide an image which already covers most needs for PHP, so you don't need to create your own. You are welcome to do so if you like, though!
 
 Here a short description of what this file does:
 
diff --git a/docs/docker-images/postgres.md b/docs/docker-images/postgres.md
index ee41c6158c..ef6b72e625 100644
--- a/docs/docker-images/postgres.md
+++ b/docs/docker-images/postgres.md
@@ -1,10 +1,12 @@
 # PostgreSQL
 
-The [Lagoon PostgreSQL Docker image](https://github.com/amazeeio/lagoon/blob/master/images/postgres/Dockerfile). Based on [the official PostgreSQL Alpine images](https://hub.docker.com/_/postgres).
+The [Lagoon PostgreSQL Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/postgres). Based on [the official PostgreSQL Alpine images](https://hub.docker.com/_/postgres).
+
 
 ## Supported versions
 
-* 11.6 [\[Dockerfile\]](https://github.com/amazeeio/lagoon/blob/master/images/postgres/Dockerfile)
+* 11 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/11.Dockerfile)
+* 12 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/postgres/12.Dockerfile)
 
 ## Tips & Tricks
 
diff --git a/docs/docker-images/rabbitmq.md b/docs/docker-images/rabbitmq.md
index 7bf245b9ba..67d3eba740 100644
--- a/docs/docker-images/rabbitmq.md
+++ b/docs/docker-images/rabbitmq.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-The [Lagoon RabbitMQ Dockerfile](https://github.com/amazeeio/lagoon/tree/master/images/rabbitmq) with management plugin installed. Based on the official `rabbitmq:3-management` image at [docker-hub](https://hub.docker.com/_/rabbitmq).
+The [Lagoon RabbitMQ Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/rabbitmq) with management plugin installed. Based on the official `rabbitmq:3-management` image at [docker-hub](https://hub.docker.com/_/rabbitmq).
 
 This Dockerfile is intended to be used to set up a standalone RabbitMQ queue broker, as well as a base image to set up a cluster with high availability queue support by default \([Mirrored queues](https://www.rabbitmq.com/ha.html)\).
 
diff --git a/docs/docker-images/redis/README.md b/docs/docker-images/redis/README.md
index e75e85ab94..9d531e18a4 100644
--- a/docs/docker-images/redis/README.md
+++ b/docs/docker-images/redis/README.md
@@ -1,12 +1,13 @@
 # Redis
 
-[Lagoon `Redis` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/redis/Dockerfile), based on [offical `redis:alpine` image](https://hub.docker.com/_/redis/).
+[Lagoon `Redis` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/redis), based on [offical `redis:alpine` image](https://hub.docker.com/_/redis/).
 
 This Dockerfile is intended to be used to set up a standalone Redis _ephemeral_ server by default.
 
-## Version
+## Supported versions
 
-Currently supports alpine version 5.x.
+* 5 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/redis/5.Dockerfile)
+* 6 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/redis/6.Dockerfile)
 
 ## Lagoon adaptions
 
diff --git a/docs/docker-images/redis/redis-persistent.md b/docs/docker-images/redis/redis-persistent.md
index b1df0e0736..87ad6243b2 100644
--- a/docs/docker-images/redis/redis-persistent.md
+++ b/docs/docker-images/redis/redis-persistent.md
@@ -1,6 +1,6 @@
 # Redis-persistent
 
-The [Lagoon `redis-persistent` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/redis-persistent/Dockerfile). Based on the [Lagoon `redis` image](./), it is intended for use if the Redis service must be in `persistent` mode \(ie. with a persistent volume where transactions will be saved\).
+The [Lagoon `redis-persistent` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/redis-persistent/5.Dockerfile). Based on the [Lagoon `redis` image](./), it is intended for use if the Redis service must be in `persistent` mode \(ie. with a persistent volume where transactions will be saved\).
 
 It differs from `redis` only for `FLAVOR` environment variable.
 
diff --git a/docs/docker-images/solr/README.md b/docs/docker-images/solr/README.md
index c34c31e5ab..40e24bf503 100644
--- a/docs/docker-images/solr/README.md
+++ b/docs/docker-images/solr/README.md
@@ -1,14 +1,14 @@
 # Solr
 
-The [Lagoon `Solr` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/solr/Dockerfile). Based on the official [`solr:<version>-alpine` images](https://hub.docker.com/_/solr).
+The [Lagoon `Solr` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/solr/7.7.Dockerfile). Based on the official [`solr:<version>-alpine` images](https://hub.docker.com/_/solr).
 
 This Dockerfile is intended to be used to set up a standalone Solr server with an initial core `mycore`.
 
 ## Supported Versions
 
-* 5.5
-* 6.6
-* 7.7
+* 5.5 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr/5.5.Dockerfile)
+* 6.6 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr/6.6.Dockerfile)
+* 7.7 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr/7.7.Dockerfile)
 
 ## Lagoon adaptions
 
diff --git a/docs/docker-images/solr/solr-drupal.md b/docs/docker-images/solr/solr-drupal.md
index 78f8b0e1ee..bcee78ccc8 100644
--- a/docs/docker-images/solr/solr-drupal.md
+++ b/docs/docker-images/solr/solr-drupal.md
@@ -1,6 +1,6 @@
 # Solr-Drupal
 
-The [Lagoon `solr-drupal` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/solr-drupal/Dockerfile), is a customized[`Solr` image](./) to use within Drupal projects in Lagoon.
+The [Lagoon `solr-drupal` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/7.7.Dockerfile), is a customized[`Solr` image](./) to use within Drupal projects in Lagoon.
 
 The initial core created is `Drupal` , and it is created and configured starting from a Drupal customized and optimized configuration, copied from the [search\_api\_solr](https://www.drupal.org/project/search_api_solr) Drupal module.
 
@@ -8,9 +8,10 @@ The [documentation](./#lagoon-and-openshift-adaptions) outlines how to provide y
 
 For each Solr version, there is a specific `solr-drupal:<version>` Docker image.
 
-## Supported versions
+## Supported Versions
+
+* 5.5 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/5.5.Dockerfile)
+* 6.6 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/6.6.Dockerfile)
+* 7.7 [\[Dockerfile\]](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/7.7.Dockerfile)
 
-* 5.5
-* 6.6
-* 7.7
 
diff --git a/docs/docker-images/varnish/README.md b/docs/docker-images/varnish/README.md
index b239954767..4cc0b80c12 100644
--- a/docs/docker-images/varnish/README.md
+++ b/docs/docker-images/varnish/README.md
@@ -1,6 +1,6 @@
 # Varnish
 
-The [Lagoon `Varnish` image Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/varnish/Dockerfile). Based on the [official `varnish` package](https://hub.docker.com/_/varnish) provided by `alpine:3.7` image.
+The [Lagoon `Varnish` image Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish/Dockerfile). Based on the [official `varnish` package](https://hub.docker.com/_/varnish) provided by `alpine:3.7` image.
 
 By default, `vmod-dynamic` and `vmod-bodyaccess` modules are installed.
 
diff --git a/docs/docker-images/varnish/varnish-drupal.md b/docs/docker-images/varnish/varnish-drupal.md
index 9ec92724fd..4bb30bd33b 100644
--- a/docs/docker-images/varnish/varnish-drupal.md
+++ b/docs/docker-images/varnish/varnish-drupal.md
@@ -1,6 +1,6 @@
 # Varnish-Drupal
 
-The [Lagoon `varnish-drupal` Docker image](https://github.com/amazeeio/lagoon/blob/master/images/varnish-drupal/Dockerfile). It is a customized [`varnish` image](./) to use within Drupal projects in Lagoon.
+The [Lagoon `varnish-drupal` Docker image](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal/Dockerfile). It is a customized [`varnish` image](./) to use within Drupal projects in Lagoon.
 
 It differs from `varnish` only for `default.vcl` file, optimized for Drupal on Lagoon.
 
diff --git a/docs/drupal/services/solr.md b/docs/drupal/services/solr.md
index 1a0d2c1865..df81fcbdc7 100644
--- a/docs/drupal/services/solr.md
+++ b/docs/drupal/services/solr.md
@@ -6,7 +6,7 @@ For Solr 5.5, 6.6 and 7.7, we ship the default schema files provided by the [sea
 
 ## Custom schema
 
-To implement schema customizations for Solr in your project, look to how Lagoon [creates our standard images](https://github.com/amazeeio/lagoon/blob/master/images/solr-drupal/Dockerfile).
+To implement schema customizations for Solr in your project, look to how Lagoon [creates our standard images](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/7.7.Dockerfile).
 
 * In the `solr` section of your `docker-compose.yml` file, replace `image: amazeeio/solr:7.7` with:
 
diff --git a/docs/drupal/services/varnish.md b/docs/drupal/services/varnish.md
index 5bd20c368e..f748a40dfa 100644
--- a/docs/drupal/services/varnish.md
+++ b/docs/drupal/services/varnish.md
@@ -1,6 +1,6 @@
 # Varnish
 
-We suggest using Drupal with a Varnish reverse proxy. Lagoon provides a `varnish-drupal` Docker image that has Varnish already configured with a [Drupal Varnish config](https://github.com/amazeeio/lagoon/blob/master/images/varnish-drupal/drupal.vcl).
+We suggest using Drupal with a Varnish reverse proxy. Lagoon provides a `varnish-drupal` Docker image that has Varnish already configured with a [Drupal Varnish config](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal/drupal.vcl).
 
 This Varnish config does the following:
 
@@ -8,7 +8,7 @@ This Varnish config does the following:
 * It automatically caches any assets \(images, css, js, etc.\) for one month, and also sends this header to the browser, so browser cache the assets as well. This happens for authenticated and non-authenticated requests.
 * It has support for `BAN` and `URIBAN` which is used by the Drupal 8 purge module.
 * It removes `utm_` and `gclid` from the URL parameter to prevent Google Analytics links from creating multiple cache objects.
-* Many other good things - just check out the [drupal.vcl](https://github.com/amazeeio/lagoon/blob/master/images/varnish-drupal/drupal.vcl).
+* Many other good things - just check out the [drupal.vcl](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal/drupal.vcl).
 
 ## Usage with Drupal 8
 
diff --git a/docs/using-lagoon-the-basics/index.md b/docs/using-lagoon-the-basics/index.md
index fb63c636e0..a35a41500f 100644
--- a/docs/using-lagoon-the-basics/index.md
+++ b/docs/using-lagoon-the-basics/index.md
@@ -48,26 +48,28 @@ Some Docker images and containers need additional customizations from the provid
 
 | Type | Versions | Dockerfile |
 | :--- | :--- | :--- |
-| [Elasticsearch](../docker-images/elasticsearch.md) | 6.8, 7.6 | [elasticsearch/Dockerfiles](https://github.com/amazeeio/lagoon/tree/master/images/elasticsearch) |
-| [MariaDB-Drupal](../docker-images/mariadb/mariadb-drupal.md) |  | [mariadb-drupal/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/mariadb-drupal/Dockerfile) |
-| [MariaDB](../docker-images/mariadb/) | 10.4 | [mariadb/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/mariadb/Dockerfile) |
-| [MongoDB](../docker-images/mongodb.md) | 3.6 | [mongo/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/mongo/Dockerfile) |
-| [NGINX](../docker-images/nginx/) | openresty/1.15.8.2 | [nginx/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/nginx/Dockerfile) |
-| [NGINX-Drupal](../docker-images/nginx/nginx-drupal.md) |  | [nginx-drupal/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/nginx-drupal/Dockerfile) |
-| [PHP-fpm-Drupal](../docker-images/php-cli/php-cli-drupal.md) | 7.2, 7.3, 7.4 | [php/cli-drupal/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/php/cli-drupal/Dockerfile) |
-| [PHP-cli](../docker-images/php-cli/) | 7.2, 7.3, 7.4 | [php/cli/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/php/cli/Dockerfile) |
-| [PHP-fpm](../docker-images/php-fpm.md) | 7.2, 7.3, 7.4 | [php/fpm/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/php/fpm/Dockerfile) |
-| [PostgreSQL](../docker-images/postgres.md) | 11.6 | [postgres/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/postgres/Dockerfile) |
-| Python | 2.7, 3.7 | [python/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/python/Dockerfile) |
-| [RabbitMQ](../docker-images/rabbitmq.md) | 3.8 | [rabbitmq/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/rabbitmq/Dockerfile) |
-| [Redis-persistent](../docker-images/redis/redis-persistent.md) | 5.0 | [redis-persistent/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/redis-persistent/Dockerfile) |
-| [Redis](https://github.com/AlannaBurke/lagoon/tree/6c60efce4fc48ebd7d5858cedaafb6ed86b704ee/docs/docker_images/redis.md) | 5.0 | [redis/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/redis/Dockerfile) |
-| [Solr-Drupal](../docker-images/solr/solr-drupal.md) | 5.5, 6.6, 7.7 | [solr-drupal/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/solr-drupal/Dockerfile) |
-| [Solr](../docker-images/solr/) | 5.5, 6.6, 7.7 | [solr/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/solr/Dockerfile) |
-| [Varnish-Drupal](../docker-images/varnish/varnish-drupal.md) | 5.2 | [varnish-drupal/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/varnish-drupal/Dockerfile) |
-| [Varnish](../docker-images/varnish/) | 5.2 | [varnish/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/varnish/Dockerfile) |
-
-All images are pushed to [https://hub.docker.com/u/amazeeio](https://hub.docker.com/u/amazeeio). We suggest always using the latest tag \(like `amazeeio/nginx:latest`\) or unsuffixed images \(like `amazeeio/node:14`\), as they are kept up to date in terms of features and security.
-
-If you choose to use a specific Lagoon version of an image like `amazeeio/nginx:v0.21.0` or `amazeeio/node:10-v0.21.0` it is your own responsibility to upgrade the version of the images as soon as a new Lagoon version is released!
+| [MariaDB](../docker-images/mariadb/) | 10.4 | [mariadb/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb) |
+| [MariaDB (Drupal)](../docker-images/mariadb/mariadb-drupal.md) |  | [mariadb-drupal/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/mariadb-drupal) |
+| [PostgreSQL](../docker-images/postgres.md) | 11, 12 | [postgres/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/postgres) |
+| [MongoDB](../docker-images/mongodb.md) | 3.6 | [mongo/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/mongo) |
+| [NGINX](../docker-images/nginx/) | openresty/1.19 | [nginx/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/nginx) |
+| [NGINX (Drupal)](../docker-images/nginx/nginx-drupal.md) | openresty/1.19 | [nginx-drupal/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/nginx-drupal) |
+| [PHP FPM](../docker-images/php-fpm.md) | 7.2, 7.3, 7.4 | [php/fpm/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/php-fpm) |
+| [PHP CLI](../docker-images/php-cli/) | 7.2, 7.3, 7.4 | [php/cli/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli) |
+| [PHP CLI (Drupal)](../docker-images/php-cli/php-cli-drupal.md) | 7.3, 7.4, 8.0 | [php/cli-drupal/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/php-cli-drupal) |
+| Python | 2.7, 3.7, 3.8 | [python/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/python) |
+| [Redis](../docker-images/redis.md) | 5, 6 | [redis/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/redis) |
+| [Redis-persistent](../docker-images/redis/redis-persistent.md) | 5, 6 | [redis-persistent/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/redis-persistent) |
+| [Solr](../docker-images/solr/) | 5.5, 6.6, 7.7 | [solr/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/solr) |
+| [Solr (Drupal)](../docker-images/solr/solr-drupal.md) | 5.5, 6.6, 7.7 | [solr-drupal/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal) |
+| [Varnish](../docker-images/varnish/) | 5 | [varnish/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish) |
+| [Varnish (Drupal)](../docker-images/varnish/varnish-drupal.md) | 5 | [varnish-drupal/Dockerfile](https://github.com/uselagoon/lagoon-images/blob/main/images/varnish-drupal) |
+| [Elasticsearch](../docker-images/elasticsearch.md) | 6, 7 | [elasticsearch/Dockerfiles](https://github.com/uselagoon/lagoon-images/blob/main/images/elasticsearch) |
+| [Logstash](../docker-images/elasticsearch.md) | 6, 7 | [logstash/Dockerfiles](https://github.com/uselagoon/lagoon-images/blob/main/images/logstash) |
+| [Kibana](../docker-images/elasticsearch.md) | 6, 7 | [kibana/Dockerfiles](https://github.com/uselagoon/lagoon-images/blob/main/images/kibana) |
+| [RabbitMQ](../docker-images/rabbitmq.md) | 3.8 | [rabbitmq/Dockerfile](https://github.com/amazeeio/lagoon/blob/master/images/rabbitmq) |
+
+All images are pushed to [https://hub.docker.com/u/uselagoon](https://hub.docker.com/u/uselagoon). We suggest always using the latest tag \(like `uselagoon/nginx:latest`\) or unsuffixed images \(like `amazeeio/node:14`\), as they are kept up to date in terms of features and security.
+
+If you choose to use a specific Lagoon version of an image like `uselagoon/nginx:20.10.0` or `uselagoon/node-10:20.10.0` it is your own responsibility to upgrade the version of the images as soon as a new Lagoon version is released!