From bb78dbffae42d447bf0bd2ae1c05ea15e313d934 Mon Sep 17 00:00:00 2001 From: Anton Komarev Date: Sun, 1 Mar 2026 12:07:57 +0300 Subject: [PATCH 1/2] Update Docker dev env --- .docker/{php80/Dockerfile => php80.Dockerfile} | 0 .docker/{php81/Dockerfile => php81.Dockerfile} | 0 .docker/{php82/Dockerfile => php82.Dockerfile} | 0 .docker/{php83/Dockerfile => php83.Dockerfile} | 0 .gitattributes | 1 + docker-compose.yml => compose.yml | 8 ++++---- 6 files changed, 5 insertions(+), 4 deletions(-) rename .docker/{php80/Dockerfile => php80.Dockerfile} (100%) rename .docker/{php81/Dockerfile => php81.Dockerfile} (100%) rename .docker/{php82/Dockerfile => php82.Dockerfile} (100%) rename .docker/{php83/Dockerfile => php83.Dockerfile} (100%) rename docker-compose.yml => compose.yml (88%) diff --git a/.docker/php80/Dockerfile b/.docker/php80.Dockerfile similarity index 100% rename from .docker/php80/Dockerfile rename to .docker/php80.Dockerfile diff --git a/.docker/php81/Dockerfile b/.docker/php81.Dockerfile similarity index 100% rename from .docker/php81/Dockerfile rename to .docker/php81.Dockerfile diff --git a/.docker/php82/Dockerfile b/.docker/php82.Dockerfile similarity index 100% rename from .docker/php82/Dockerfile rename to .docker/php82.Dockerfile diff --git a/.docker/php83/Dockerfile b/.docker/php83.Dockerfile similarity index 100% rename from .docker/php83/Dockerfile rename to .docker/php83.Dockerfile diff --git a/.gitattributes b/.gitattributes index c9b3927..f5b0ffb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,5 @@ .gitignore export-ignore /CODE_OF_CONDUCT.md export-ignore /CONTRIBUTING.md export-ignore +/compose.yml export-ignore /phpunit.xml.dist export-ignore diff --git a/docker-compose.yml b/compose.yml similarity index 88% rename from docker-compose.yml rename to compose.yml index bfbf950..f3283fd 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -4,7 +4,7 @@ services: image: php-opentsdb-client-lib-80 build: context: ./ - dockerfile: ./.docker/php80/Dockerfile + dockerfile: ./.docker/php80.Dockerfile tty: true working_dir: /app volumes: @@ -17,7 +17,7 @@ services: image: php-opentsdb-client-lib-81 build: context: ./ - dockerfile: ./.docker/php81/Dockerfile + dockerfile: ./.docker/php81.Dockerfile tty: true working_dir: /app volumes: @@ -30,7 +30,7 @@ services: image: php-opentsdb-client-lib-82 build: context: ./ - dockerfile: ./.docker/php82/Dockerfile + dockerfile: ./.docker/php82.Dockerfile tty: true working_dir: /app volumes: @@ -43,7 +43,7 @@ services: image: php-opentsdb-client-lib-83 build: context: ./ - dockerfile: ./.docker/php83/Dockerfile + dockerfile: ./.docker/php83.Dockerfile tty: true working_dir: /app volumes: From 4e05dd72b7b9c3de9ad61b1275f00d9079fa4a95 Mon Sep 17 00:00:00 2001 From: Anton Komarev Date: Sun, 1 Mar 2026 12:09:00 +0300 Subject: [PATCH 2/2] Update Docker dev env --- .docker/php84.Dockerfile | 22 ++++++++++++++++++++++ .docker/php85.Dockerfile | 22 ++++++++++++++++++++++ compose.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 .docker/php84.Dockerfile create mode 100644 .docker/php85.Dockerfile diff --git a/.docker/php84.Dockerfile b/.docker/php84.Dockerfile new file mode 100644 index 0000000..5ca38c2 --- /dev/null +++ b/.docker/php84.Dockerfile @@ -0,0 +1,22 @@ +# ---------------------- +# The FPM base container +# ---------------------- +FROM php:8.4-cli-alpine AS dev + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS + +# Cleanup apk cache and temp files +RUN rm -rf /var/cache/apk/* /tmp/* + +# ---------------------- +# Composer install step +# ---------------------- + +# Get latest Composer +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer + +# ---------------------- +# The FPM production container +# ---------------------- +FROM dev diff --git a/.docker/php85.Dockerfile b/.docker/php85.Dockerfile new file mode 100644 index 0000000..10f031a --- /dev/null +++ b/.docker/php85.Dockerfile @@ -0,0 +1,22 @@ +# ---------------------- +# The FPM base container +# ---------------------- +FROM php:8.5-cli-alpine AS dev + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS + +# Cleanup apk cache and temp files +RUN rm -rf /var/cache/apk/* /tmp/* + +# ---------------------- +# Composer install step +# ---------------------- + +# Get latest Composer +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer + +# ---------------------- +# The FPM production container +# ---------------------- +FROM dev diff --git a/compose.yml b/compose.yml index f3283fd..a463318 100644 --- a/compose.yml +++ b/compose.yml @@ -51,6 +51,32 @@ services: networks: - php-opentsdb-client-lib + php84: + container_name: php-opentsdb-client-lib-php-84 + image: php-opentsdb-client-lib-84 + build: + context: ./ + dockerfile: ./.docker/php84.Dockerfile + tty: true + working_dir: /app + volumes: + - ./:/app + networks: + - php-opentsdb-client-lib + + php85: + container_name: php-opentsdb-client-lib-php-85 + image: php-opentsdb-client-lib-85 + build: + context: ./ + dockerfile: ./.docker/php85.Dockerfile + tty: true + working_dir: /app + volumes: + - ./:/app + networks: + - php-opentsdb-client-lib + opentsdb: container_name: php-opentsdb-client-lib-opentsdb image: petergrace/opentsdb-docker:latest