From cdad685ca83ac1f9c038c5d64bdbe0389e6f9eb2 Mon Sep 17 00:00:00 2001 From: Anton Komarev Date: Mon, 2 Mar 2026 11:04:57 +0300 Subject: [PATCH] Optimize docker dev --- .docker/php.Dockerfile | 4 ++++ .docker/php80.Dockerfile | 22 ---------------------- .docker/php81.Dockerfile | 22 ---------------------- .docker/php82.Dockerfile | 22 ---------------------- .docker/php83.Dockerfile | 22 ---------------------- .docker/php84.Dockerfile | 22 ---------------------- .docker/php85.Dockerfile | 22 ---------------------- .gitattributes | 9 ++++++--- .gitignore | 1 + compose.yml | 30 ++++++++++++++++++------------ 10 files changed, 29 insertions(+), 147 deletions(-) create mode 100644 .docker/php.Dockerfile delete mode 100644 .docker/php80.Dockerfile delete mode 100644 .docker/php81.Dockerfile delete mode 100644 .docker/php82.Dockerfile delete mode 100644 .docker/php83.Dockerfile delete mode 100644 .docker/php84.Dockerfile delete mode 100644 .docker/php85.Dockerfile diff --git a/.docker/php.Dockerfile b/.docker/php.Dockerfile new file mode 100644 index 0000000..64dc6a4 --- /dev/null +++ b/.docker/php.Dockerfile @@ -0,0 +1,4 @@ +ARG PHP_VERSION +FROM php:${PHP_VERSION}-cli-alpine + +COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/.docker/php80.Dockerfile b/.docker/php80.Dockerfile deleted file mode 100644 index 9220e23..0000000 --- a/.docker/php80.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# The FPM base container -# ---------------------- -FROM php:8.0-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/php81.Dockerfile b/.docker/php81.Dockerfile deleted file mode 100644 index 886291b..0000000 --- a/.docker/php81.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# The FPM base container -# ---------------------- -FROM php:8.1-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/php82.Dockerfile b/.docker/php82.Dockerfile deleted file mode 100644 index 1067d5c..0000000 --- a/.docker/php82.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# The FPM base container -# ---------------------- -FROM php:8.2-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/php83.Dockerfile b/.docker/php83.Dockerfile deleted file mode 100644 index 4d8d02e..0000000 --- a/.docker/php83.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# The FPM base container -# ---------------------- -FROM php:8.3-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/php84.Dockerfile b/.docker/php84.Dockerfile deleted file mode 100644 index 5ca38c2..0000000 --- a/.docker/php84.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# 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 deleted file mode 100644 index 10f031a..0000000 --- a/.docker/php85.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# ---------------------- -# 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/.gitattributes b/.gitattributes index f5b0ffb..06e1af6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,9 +2,12 @@ /.docker export-ignore /.github export-ignore -/tests export-ignore -.gitattributes export-ignore -.gitignore export-ignore +/test export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/.editorconfig export-ignore +/AGENTS.md export-ignore +/CLAUDE.md export-ignore /CODE_OF_CONDUCT.md export-ignore /CONTRIBUTING.md export-ignore /compose.yml export-ignore diff --git a/.gitignore b/.gitignore index 51e3a3b..869ca51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.claude/ /.docker_data_hbase /.idea /vendor diff --git a/compose.yml b/compose.yml index a463318..5cc55f9 100644 --- a/compose.yml +++ b/compose.yml @@ -1,10 +1,11 @@ services: php80: container_name: php-opentsdb-client-lib-php-80 - image: php-opentsdb-client-lib-80 build: context: ./ - dockerfile: ./.docker/php80.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.0" tty: true working_dir: /app volumes: @@ -14,10 +15,11 @@ services: php81: container_name: php-opentsdb-client-lib-php-81 - image: php-opentsdb-client-lib-81 build: context: ./ - dockerfile: ./.docker/php81.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.1" tty: true working_dir: /app volumes: @@ -27,10 +29,11 @@ services: php82: container_name: php-opentsdb-client-lib-php-82 - image: php-opentsdb-client-lib-82 build: context: ./ - dockerfile: ./.docker/php82.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.2" tty: true working_dir: /app volumes: @@ -40,10 +43,11 @@ services: php83: container_name: php-opentsdb-client-lib-php-83 - image: php-opentsdb-client-lib-83 build: context: ./ - dockerfile: ./.docker/php83.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.3" tty: true working_dir: /app volumes: @@ -53,10 +57,11 @@ services: php84: container_name: php-opentsdb-client-lib-php-84 - image: php-opentsdb-client-lib-84 build: context: ./ - dockerfile: ./.docker/php84.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.4" tty: true working_dir: /app volumes: @@ -66,10 +71,11 @@ services: php85: container_name: php-opentsdb-client-lib-php-85 - image: php-opentsdb-client-lib-85 build: context: ./ - dockerfile: ./.docker/php85.Dockerfile + dockerfile: ./.docker/php.Dockerfile + args: + PHP_VERSION: "8.5" tty: true working_dir: /app volumes: