Skip to content

Commit

Permalink
docker-compose.yaml: use PHP 8.3 (#568)
Browse files Browse the repository at this point in the history
* docker-compose.yaml: use PHP 8.3

* Update README.md

* Update pimcore-demo.yml

* Update pimcore-demo.yml

* removing the extra line, will be testing only 8.3

will be applied on #578

---------

Co-authored-by: JiaJia Ji <kingjia90@gmail.com>
  • Loading branch information
brusch and kingjia90 authored Jul 2, 2024
1 parent d24a1ce commit e2cd5b1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/pimcore-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ jobs:
path: 'demo'

- name: Pull latest pimcore image
env:
PHP_VERSION: "${{ matrix.php-version }}"
run: |
# Echo commands and terminate on first error
set -ex
# Pull latest build of pimcore's image
docker pull docker.io/pimcore/pimcore:php8.2-latest
docker pull docker.io/pimcore/pimcore:php"${PHP_VERSION}"-latest
- name: Create project from demo in latest pimcore environment
env:
PHP_VERSION: "${{ matrix.php-version }}"
run: |
# Echo commands and terminate on first error
set -ex
Expand All @@ -55,7 +59,7 @@ jobs:
--volume=${{ github.workspace }}/:/test/ \
--workdir=/test/ \
--user=$(id -u):$(id -g) \
docker.io/pimcore/pimcore:php8.2-latest \
docker.io/pimcore/pimcore:php"${PHP_VERSION}"-latest \
composer create-project \
pimcore/demo:@dev \
--repository='{"type": "path", "url": "./demo"}' \
Expand Down Expand Up @@ -145,4 +149,4 @@ jobs:
- name: Compose down
run: |
cd sample-project/
docker-compose down -v --remove-orphans
docker-compose down -v --remove-orphans
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ You don't need to have a PHP environment with composer installed.
### Follow these steps

1. Initialize the demo project using the `pimcore/pimcore` image
``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:php8.2-latest composer create-project pimcore/demo my-project``
``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:php8.3-latest composer create-project pimcore/demo my-project``
1. Go to your new project
`cd my-project/`
1. Part of the new project is a docker compose file
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:

php:
#user: '1000:1000' # set to your uid:gid
image: pimcore/pimcore:php8.2-debug-latest
image: pimcore/pimcore:php8.3-debug-latest
environment:
COMPOSER_HOME: /var/www/html
PHP_IDE_CONFIG: serverName=localhost
Expand All @@ -41,7 +41,7 @@ services:

supervisord:
#user: '1000:1000' # set to your uid:gid
image: pimcore/pimcore:php8.2-supervisord-latest
image: pimcore/pimcore:php8.3-supervisord-latest
depends_on:
- db
volumes:
Expand Down

0 comments on commit e2cd5b1

Please sign in to comment.