Update docker compose default php version to 8.1 (#1259)

* Update default php version for docker compose * Use docker compose v2 > From July 2023 Compose V1 stopped receiving updates.
open-telemetry · Mar 15, 2024 · 639d8e2 · 639d8e2
1 parent 4cb0499
commit 639d8e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 include .env
 
-PHP_VERSION ?= 8.0
-DOCKER_COMPOSE ?= docker-compose
+PHP_VERSION ?= 8.1
+DOCKER_COMPOSE ?= docker compose
 DC_RUN_PHP = $(DOCKER_COMPOSE) run --rm php
 
 .DEFAULT_GOAL : help
@@ -15,7 +15,7 @@ all-checks: rector style deptrac packages-composer phan psalm phpstan test ## Ru
 pull: ## Pull latest developer image
 	$(DOCKER_COMPOSE) pull php
 build: ## Build developer image locally
-	docker build docker/ --build-arg PHP_VERSION -t ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION}
+	docker build docker/ --build-arg PHP_VERSION=${PHP_VERSION} -t ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION}
 install: ## Install dependencies
 	$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
 update: ## Update dependencies

diff --git a/docker-compose.collector.yaml b/docker-compose.collector.yaml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.1}
     volumes:
     - ./:/usr/src/myapp
     depends_on:

diff --git a/docker-compose.w3cTraceContext.yaml b/docker-compose.w3cTraceContext.yaml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.1}
     volumes:
     - ./:/usr/src/myapp
     - ./:/usr/src/open-telemetry/

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   php:
-    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.0}
+    image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION:-8.1}
     volumes:
     - ./:/usr/src/myapp
     user: "${PHP_USER}:root"