Update docker-entrypoint.sh #324
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tianon
reviewed
Aug 9, 2018
docker-entrypoint.sh
Outdated
| @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then | |||
| group="$(id -g)" | |||
| fi | |||
|
|
|||
| if ! [ -e index.php -a -e wp-includes/version.php ]; then | |||
| if ! [ -e index.php -e wp-includes/version.php ]; then | |||
There was a problem hiding this comment.
This isn't quite right:
$ [ -e xyz -e abc ]
-bash: [: too many argumentsWhat this needs to be updated to instead is something like:
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; thenThere was a problem hiding this comment.
Resolved. Thanks for the review.
Signed-off-by: Jake Tarren <jake@zensystem.io>
|
Thanks! |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Aug 14, 2018
- `docker`: 18.06.1-ce-rc1 - `ghost`: 1.25.5 - `golang`: 1.11rc1 - `memcached`: 1.5.10 - `mysql`: expose `mysqlx` port (docker-library/mysql#466) - `openjdk`: 8u181 (Debian) - `postgres`: `11~beta3-1.pgdg90+2` - `rocket.chat`: 0.68.4 - `wordpress`: docker-library/wordpress#324
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Aug 14, 2018
- `docker`: 18.06.1-ce-rc1 - `ghost`: 1.25.5 - `memcached`: 1.5.10 - `mysql`: expose `mysqlx` port (docker-library/mysql#466) - `openjdk`: 8u181 (Debian) - `postgres`: `11~beta3-1.pgdg90+2` - `rocket.chat`: 0.68.4 - `wordpress`: docker-library/wordpress#324
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove depreciated
-afile operator in favor of-e.