File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 6363 php-version : 8.2
6464 coverage : none
6565
66- - name : Set up Docker Buildx
67- uses : docker/setup-buildx-action@v3
68-
6966 - name : Docker login
7067 run : echo '${{ secrets.DOCKER_PASSWORD }}' | docker login --username ${{ secrets.DOCKER_USERNAME }} --password-stdin
7168
Original file line number Diff line number Diff line change @@ -3,16 +3,9 @@ layer ?= *
33resolve_php_versions = $(or $(php_versions ) ,`jq -r '.php | join(" ") ' ${1}/config.json` )
44resolve_tags = ` ./new-docker-tags.php $(DOCKER_TAG ) `
55BREF_VERSION = 3
6- COMMA := ,
7- CACHE_FLAGS = $( if $( GITHUB_ACTIONS) ,--cache-from type=gha --cache-to type=gha$( COMMA) mode=max,)
86
97define build_docker_image
10- docker buildx build -t bref/${1} -php-${2} \
11- --build-arg PHP_VERSION=${2} \
12- --build-arg BREF_VERSION=${BREF_VERSION} \
13- $( CACHE_FLAGS) \
14- --load \
15- ${DOCKER_BUILD_FLAGS} ${1}
8+ docker build -t bref/${1} -php-${2} --build-arg PHP_VERSION=${2} --build-arg BREF_VERSION=${BREF_VERSION} ${DOCKER_BUILD_FLAGS} ${1}
169endef
1710
1811docker-images:
@@ -38,7 +31,7 @@ test: docker-images
3831 echo " ###############################################" ; \
3932 echo " ### Testing $$ {dir} PHP$$ {php_version}" ; \
4033 echo " ###" ; \
41- docker buildx build --build-arg PHP_VERSION=$$ {php_version} --build-arg TARGET_IMAGE=$$ {dir}-php-$$ {php_version} -t bref/test-$$ {dir}-$$ {php_version} $( CACHE_FLAGS ) --load tests ; \
34+ docker build --build-arg PHP_VERSION=$$ {php_version} --build-arg TARGET_IMAGE=$$ {dir}-php-$$ {php_version} -t bref/test-$$ {dir}-$$ {php_version} tests ; \
4235 docker run --entrypoint= --rm -v $$ (pwd)/$$ {dir}:/var/task bref/test-$$ {dir}-$$ {php_version} /opt/bin/php /var/task/test.php ; \
4336 if docker run --entrypoint= --rm -v $$ (pwd)/$$ {dir}:/var/task bref/test-$$ {dir}-$$ {php_version} /opt/bin/php -v 2>&1 > /dev/null | grep -q ' Unable\|Warning' ; then exit 1; fi ; \
4437 echo " " ; \
You can’t perform that action at this time.
0 commit comments