Skip to content

Commit

Permalink
build: undo changes
Browse files Browse the repository at this point in the history
  • Loading branch information
EdieLemoine committed Sep 20, 2024
1 parent 46add3b commit f31aa18
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 46 deletions.
24 changes: 0 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ All [tags in the `prestashop/prestashop` repository](https://api.github.com/repo
- 8.1
- 8.2

### Testing

To build the image, pass the following environment variables when building:

```shell
PS_VERSION=8.1.0 PHP_VERSION=8.2 docker compose build prestashop
```

## shopware

[View on GitHub Container Registry 📦](https://ghcr.io/myparcelnl/shopware)
Expand All @@ -65,14 +57,6 @@ Shopware images based on `php-xd`.
- 8.2
- 8.1

### Testing

To build the image, pass the following environment variables when building:

```shell
SW_VERSION=6.5 PHP_VERSION=7.4 docker compose build shopware
```

## wordpress

[View on GitHub Container Registry 📦](https://ghcr.io/myparcelnl/wordpress)
Expand All @@ -89,11 +73,3 @@ All versions returned by [the WordPress API](https://api.wordpress.org/core/vers

- 7.4
- 8.2

### Testing

To build the image, pass the following environment variables when building:

```shell
WP_VERSION=6.5.3 PHP_VERSION=7.4 docker compose build wordpress
```
37 changes: 15 additions & 22 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
services:
###
# Main php container
#
# This container runs the php-fpm process and serves WordPress.
#
# Requires the db container to be running.
#
# Contains:
# - php-fpm, xdebug, composer
# - WordPress installation (in volume web-data)
# - Various tools: zsh, vim
#
# See https://github.com/myparcelnl/docker-images/pkgs/container/wordpress
##
wordpress:
image: ghcr.io/myparcelnl/wordpress:${WP_VERSION}-php${PHP_VERSION}
image: ghcr.io/myparcelnl/wordpress:6.3-php7.4
build:
context: images/wordpress
dockerfile: Dockerfile
args:
PHP_VERSION: ${PHP_VERSION}
WP_VERSION: ${WP_VERSION}

prestashop:
image: ghcr.io/myparcelnl/prestashop:${PS_VERSION}-php${PHP_VERSION}
build:
context: images/prestashop
dockerfile: Dockerfile
args:
PHP_VERSION: ${PHP_VERSION}
PS_VERSION: ${PS_VERSION}

shopware:
image: ghcr.io/myparcelnl/shopware:${SW_VERSION}-php${PHP_VERSION}
build:
context: images/shopware
dockerfile: Dockerfile
args:
PHP_VERSION: ${PHP_VERSION}
SW_VERSION: ${SW_VERSION}

0 comments on commit f31aa18

Please sign in to comment.