From 74d85f8194109dde4a121adcb0467b0f22223a6a Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 19:31:27 +0300 Subject: [PATCH 1/7] chore: improve docker tests --- Dockerfile | 10 ++++++++-- docker-compose.yml | 14 ++++++++------ phpunit.xml.dist | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa4fdb95a..d1b4c5921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG PHP_VERSION=8.0 -ARG COMPOSER_VERSION=2.0 +ARG PHP_VERSION=8.1 +ARG COMPOSER_VERSION=2.5.4 FROM composer:${COMPOSER_VERSION} FROM php:${PHP_VERSION}-cli @@ -13,3 +13,9 @@ RUN apt-get update && \ COPY --from=composer /usr/bin/composer /usr/local/bin/composer WORKDIR /code + +COPY . . + +RUN composer install + +CMD ["./vendor/bin/phpunit"] diff --git a/docker-compose.yml b/docker-compose.yml index ec612f1fe..80993863e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,8 @@ version: '3' services: tests: container_name: tests + #platform: linux/arm64 + tty: true build: context: . dockerfile: Dockerfile @@ -15,9 +17,10 @@ services: mysql: container_name: mysql - image: mysql:5.7 + #platform: linux/arm64 + image: mysql:8.0 ports: - - 3306:3306 + - "3306:3306" environment: MYSQL_ROOT_PASSWORD: MYSQL_DATABASE: unittest @@ -27,8 +30,7 @@ services: mongodb: container_name: mongodb - image: mongo + #platform: linux/arm64 + image: mongo:latest ports: - - 27017:27017 - logging: - driver: none + - "27017:27017" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9aebe0c0a..120898c08 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -38,7 +38,7 @@ - + From 9392c5bb218845047cc696b27e38f78487268c16 Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 19:34:56 +0300 Subject: [PATCH 2/7] chore: docker remove logging driver --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 80993863e..1c833bf7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,8 +25,6 @@ services: MYSQL_ROOT_PASSWORD: MYSQL_DATABASE: unittest MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' - logging: - driver: none mongodb: container_name: mongodb From 83d5d3493ff37d639c4584ff20e98717b126df7c Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 19:41:31 +0300 Subject: [PATCH 3/7] chore: docker improve cache --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1b4c5921..99f5bd076 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,5 @@ -ARG PHP_VERSION=8.1 -ARG COMPOSER_VERSION=2.5.4 - -FROM composer:${COMPOSER_VERSION} -FROM php:${PHP_VERSION}-cli +FROM composer:2.5.4 +FROM php:8.1-cli RUN apt-get update && \ apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev && \ @@ -14,8 +11,10 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer WORKDIR /code -COPY . . +COPY composer.* ./ RUN composer install +COPY ./ ./ + CMD ["./vendor/bin/phpunit"] From ab2142c176e6b01cc10f65cea6d03b6660ae5844 Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 19:44:08 +0300 Subject: [PATCH 4/7] chore: docker remove platform --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1c833bf7e..dab907abe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,6 @@ version: '3' services: tests: container_name: tests - #platform: linux/arm64 tty: true build: context: . @@ -17,7 +16,6 @@ services: mysql: container_name: mysql - #platform: linux/arm64 image: mysql:8.0 ports: - "3306:3306" @@ -28,7 +26,6 @@ services: mongodb: container_name: mongodb - #platform: linux/arm64 image: mongo:latest ports: - "27017:27017" From b224af5a5642bdb67531dcad5f177debea0a8fe4 Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 19:47:47 +0300 Subject: [PATCH 5/7] Revert "chore: docker improve cache" This reverts commit 83d5d3493ff37d639c4584ff20e98717b126df7c. --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99f5bd076..d1b4c5921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ -FROM composer:2.5.4 -FROM php:8.1-cli +ARG PHP_VERSION=8.1 +ARG COMPOSER_VERSION=2.5.4 + +FROM composer:${COMPOSER_VERSION} +FROM php:${PHP_VERSION}-cli RUN apt-get update && \ apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev && \ @@ -11,10 +14,8 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer WORKDIR /code -COPY composer.* ./ +COPY . . RUN composer install -COPY ./ ./ - CMD ["./vendor/bin/phpunit"] From 35247a0d3290e73d5d4c7d927da206665879947c Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:04:46 +0300 Subject: [PATCH 6/7] chore: docker test move composer version --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1b4c5921..8ebf8ed7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ ARG PHP_VERSION=8.1 ARG COMPOSER_VERSION=2.5.4 -FROM composer:${COMPOSER_VERSION} FROM php:${PHP_VERSION}-cli RUN apt-get update && \ @@ -10,7 +9,7 @@ RUN apt-get update && \ pecl install xdebug && docker-php-ext-enable xdebug && \ docker-php-ext-install -j$(nproc) pdo_mysql zip -COPY --from=composer /usr/bin/composer /usr/local/bin/composer +COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/local/bin/composer WORKDIR /code From c380ce37109d9d673b6e8d74b18699b854004dd1 Mon Sep 17 00:00:00 2001 From: Divine <48183131+divine@users.noreply.github.com> Date: Sun, 19 Feb 2023 21:36:44 +0300 Subject: [PATCH 7/7] chore: docker copy cached --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ebf8ed7b..bd7e03a14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,11 @@ COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/local/bin/compos WORKDIR /code -COPY . . +COPY composer.* ./ + +RUN composer install + +COPY ./ ./ RUN composer install