Skip to content

Commit

Permalink
Revert "Try using ghcr.io for base images"
Browse files Browse the repository at this point in the history
This reverts commit eb3a5b0.
  • Loading branch information
defunctl committed Aug 30, 2024
1 parent eb3a5b0 commit fe25f8f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions containers/slic/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/composer:1 AS composer1
FROM ghcr.io/composer/composer: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
Expand Down
2 changes: 1 addition & 1 deletion containers/wordpress/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fe25f8f

Please sign in to comment.