Merge branch 'main' of github.com:Coderockr/docker-php into apache

lucassabreu · lucassabreu · commit e9b0770d205b · 2022-12-09T15:20:55.000-03:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
 
 # keep ordered alphabetically to reduce diffs
 RUN apt update && apt install -y \
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ IMAGE=ghcr.io/coderockr/php
 TAG=$(shell git branch | grep \* | cut -d ' ' -f2)
 
 build:
-	docker build . -t $(IMAGE):$(TAG)
+	DOCKER_BUILDKIT=1 docker build . -t $(IMAGE):$(TAG)
 
 push: build
 	docker push $(IMAGE):$(TAG)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.0-apache`
	`1`	`+FROM php:8.1-apache`
`2`	`2`
`3`	`3`	`# keep ordered alphabetically to reduce diffs`
`4`	`4`	`RUN apt update && apt install -y \`