From f126e78e1631949d2109baf8eecc3ec7575b8e9c Mon Sep 17 00:00:00 2001
From: Justin Frydman <justin.frydman@gmail.com>
Date: Fri, 30 Aug 2024 14:53:26 -0600
Subject: [PATCH] Revert "try a different namespace/image name for composer"

This reverts commit 6aa4438445c231792b446ff160d5b4a99d65a883.
---
 containers/slic/Dockerfile      | 6 +++---
 containers/wordpress/Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/containers/slic/Dockerfile b/containers/slic/Dockerfile
index cfeedb6..bee8fe5 100644
--- a/containers/slic/Dockerfile
+++ b/containers/slic/Dockerfile
@@ -1,10 +1,10 @@
 ARG PHP_VERSION=7.4
 
 # Source Composer 1 and 2 from the respective images, multi-layer builds.
-FROM ghcr.io/composer/docker:1 AS composer1
-FROM ghcr.io/composer/docker:2 AS composer2
+FROM composer:1 AS composer1
+FROM composer:2 AS composer2
 
-FROM ghcr.io/php/php:${PHP_VERSION}
+FROM php:${PHP_VERSION}
 
 ARG NODE_VERSION=18.13.0
 ARG NVM_VERSION=v0.39.7
diff --git a/containers/wordpress/Dockerfile b/containers/wordpress/Dockerfile
index bdb9717..153d5f0 100644
--- a/containers/wordpress/Dockerfile
+++ b/containers/wordpress/Dockerfile
@@ -2,7 +2,7 @@ ARG WORDPRESS_IMAGE_VERSION=wordpress/apache
 ARG PHP_VERSION=7.4
 ARG WP_VERSION=6.1
 
-FROM ghcr.io/wordpress/wordpress:${WP_VERSION}-php${PHP_VERSION}-apache
+FROM wordpress:${WP_VERSION}-php${PHP_VERSION}-apache
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 RUN chmod a+x /usr/local/bin/install-php-extensions && install-php-extensions xdebug
 COPY xdebug-on.sh /usr/local/bin/xdebug-on