Skip to content

Commit 330b13b

Browse files
author
Greg Bowler
committed
Do not clash with existing Dockerfile
Fixes php-actions/composer#5
1 parent 7033001 commit 330b13b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: php-build.bash

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ echo "Building PHP $ACTION_PHP_VERSION with extensions: $ACTION_PHP_EXTENSIONS .
104104
# it with the unique tag. If the layers are already built, there should be no
105105
# need to re-build, and the `docker build` step should use the cached layers of
106106
# what has just been pulled.
107-
echo "$dockerfile" > Dockerfile
107+
echo "$dockerfile" > Dockerfile-php-build
108108
echo "Dockerfile:" >> output.log 2>&1
109109
echo "$dockerfile" >> output.log 2>&1
110-
docker build --tag "$docker_tag" --cache-from "$docker_tag" . >> output.log 2>&1
110+
docker build --tag "$docker_tag" --cache-from "$docker_tag" --file Dockerfile-php-build . >> output.log 2>&1
111111
# Update the user's repository with the customised docker image, ready for the
112112
# next Github Actions run.
113113
docker push "$docker_tag" >> output.log 2>&1

0 commit comments

Comments
 (0)