Skip to content

Commit

Permalink
Renamed compose service ezpphp to ezphp
Browse files Browse the repository at this point in the history
  • Loading branch information
vidarl committed Aug 12, 2015
1 parent bfa783d commit b89b0b2
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -226,7 +226,7 @@ Remove the containers:
```docker-compose -f docker-compose.yml rm -v; docker-compose -f docker-compose_ezpinstall.yml rm -v```

Remove the images:
```docker rmi ezpublishdocker_web1 ezpublishdocker_ezpphp```
```docker rmi ezpublishdocker_web1 ezpublishdocker_ezphp```

Remove the eZ Platform files:
```sudo rm -rf volumes/ezpublish/* volumes/mysql/*; sudo rm volumes/ezpublish/.travis.yml volumes/ezpublish/.gitignore```
2 changes: 1 addition & 1 deletion docker-compose.yml
Expand Up @@ -25,7 +25,7 @@ db1:

phpfpm1:
# docker compose does not allow to specify container name, this is what it generates, might be fixed in 1.3
image: ezpublishdocker_ezpphp:latest
image: ezpublishdocker_ezphp:latest
links:
- db1:db
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose_ezpinstall.sh
Expand Up @@ -61,4 +61,4 @@ fi
${COMPOSE_EXECUTION_PATH}docker-compose -f $YMLFILE up --no-recreate

echo "Running Composer : composer --no-interaction create-project ${EZ_COMPOSERPARAM?}"
${COMPOSE_EXECUTION_PATH}docker-compose -f $YMLFILE run --rm ezpphp composer --no-interaction create-project --no-progress ${EZ_COMPOSERPARAM?};
${COMPOSE_EXECUTION_PATH}docker-compose -f $YMLFILE run --rm ezphp composer --no-interaction create-project --no-progress ${EZ_COMPOSERPARAM?};
4 changes: 2 additions & 2 deletions docker-compose_ezpinstall.yml
Expand Up @@ -10,8 +10,8 @@ composercachevol:
volumes:
- volumes/composercache:/var/.composer/cache

ezpphp:
build: dockerfiles/ezpublish
ezphp:
build: dockerfiles/ezphp
volumes_from:
- ezpublishvol
- composercachevol
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions dockerfiles/ezphp/kickstart_template.ini
@@ -0,0 +1 @@
# Kickstart file not found. Please check your kickstart settings ( like EZ_KICKSTART_FROM_TEMPLATE ) in config/docker-compose.config if you want a kickstart file
File renamed without changes.

0 comments on commit b89b0b2

Please sign in to comment.