From 50caea688115cc100fc0188165bae134a97a1aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= Date: Sun, 8 Sep 2024 00:01:33 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=20?= =?UTF-8?q?=D1=81=20Postgres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/{config.yml => config.yml} | 0 docker/Dockerfile | 0 docker/docker-compose.yaml | 13 +++++++++++++ 3 files changed, 13 insertions(+) rename .github/ISSUE_TEMPLATE/{config.yml => config.yml} (100%) create mode 100644 docker/Dockerfile create mode 100644 docker/docker-compose.yaml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .github/ISSUE_TEMPLATE/config.yml diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml new file mode 100644 index 0000000..8cb55ba --- /dev/null +++ b/docker/docker-compose.yaml @@ -0,0 +1,13 @@ +services: + db: + image: postgres + restart: always + + shm_size: 128mb + + environment: + POSTGRES_DB: bitrixAppDb + POSTGRES_USER: kirill + POSTGRES_PASSWORD: bitrix24lib + + From 507fb9fb35ea3ae5286586222da4f5aa8791ac58 Mon Sep 17 00:00:00 2001 From: KarlsonComplete Date: Tue, 24 Sep 2024 21:51:24 +0300 Subject: [PATCH 2/3] =?UTF-8?q?-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80?= =?UTF-8?q?=20=D1=81=20nginx,php-fpm=20=D0=B8=20postgres.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 25 +++++++++++++++++++++++++ docker/Dockerfile | 0 docker/docker-compose.yaml | 13 ------------- docker/nginx/Dockerfile | 5 +++++ docker/nginx/conf.d/nginx.conf | 20 ++++++++++++++++++++ docker/php-fpm/Dockerfile | 11 +++++++++++ docker/postgres/Dockerfile | 12 ++++++++++++ index.php | 17 +++++++++++++++++ 8 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 docker-compose.yaml delete mode 100644 docker/Dockerfile delete mode 100644 docker/docker-compose.yaml create mode 100644 docker/nginx/Dockerfile create mode 100644 docker/nginx/conf.d/nginx.conf create mode 100644 docker/php-fpm/Dockerfile create mode 100644 docker/postgres/Dockerfile create mode 100644 index.php diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..ada4115 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,25 @@ +services: + php-fpm: + build: + context: ./docker/php-fpm + volumes: + - ./:/var/www/bitrix24-php-lib + nginx: + build: + context: ./docker/nginx + volumes: + - ./:/var/www/bitrix24-php-lib + ports: + - "8081:80" + depends_on: + - php-fpm + postgres-container: + image: postgres + build: + context: ./docker/postgres + ports: + - "5432:5432" + volumes: + - ./docker/postgres/data:/var/lib/postgresql/data + restart: always + diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index 8cb55ba..0000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,13 +0,0 @@ -services: - db: - image: postgres - restart: always - - shm_size: 128mb - - environment: - POSTGRES_DB: bitrixAppDb - POSTGRES_USER: kirill - POSTGRES_PASSWORD: bitrix24lib - - diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile new file mode 100644 index 0000000..922b636 --- /dev/null +++ b/docker/nginx/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx:1.27-alpine + +RUN rm /etc/nginx/conf.d/default.conf + +COPY ./conf.d/nginx.conf /etc/nginx/conf.d/ \ No newline at end of file diff --git a/docker/nginx/conf.d/nginx.conf b/docker/nginx/conf.d/nginx.conf new file mode 100644 index 0000000..7ef599a --- /dev/null +++ b/docker/nginx/conf.d/nginx.conf @@ -0,0 +1,20 @@ +server { + listen 80; + server_name localhost; + + root /var/www/bitrix24-php-lib; + index index.html index.htm index.php; + + # Redirects requests to index.php if the file is not found + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + # Passes PHP requests to PHP-FPM container + location ~ \.php$ { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_pass php-fpm:9000; # Replace with your PHP-FPM container name + fastcgi_index index.php; + } +} \ No newline at end of file diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile new file mode 100644 index 0000000..7d707ee --- /dev/null +++ b/docker/php-fpm/Dockerfile @@ -0,0 +1,11 @@ +FROM php:8.2-fpm-alpine + + +RUN set -ex \ + && apk --no-cache add \ + postgresql-dev \ + && docker-php-ext-install pdo pdo_pgsql + +WORKDIR /bitrix24-php-lib + +COPY ./ ./ \ No newline at end of file diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile new file mode 100644 index 0000000..8d7a370 --- /dev/null +++ b/docker/postgres/Dockerfile @@ -0,0 +1,12 @@ +FROM postgres:16.4-alpine + +# Устанавливаем переменные окружения для настройки базы данных +ENV POSTGRES_USER=kirill +ENV POSTGRES_PASSWORD=bitrix24lib +ENV POSTGRES_DB=bitrixAppDb + +# Копируем SQL-скрипты для инициализации базы данных (если есть) +# COPY init.sql /docker-entrypoint-initdb.d/ + +# Открываем порт PostgreSQL +EXPOSE 5432 \ No newline at end of file diff --git a/index.php b/index.php new file mode 100644 index 0000000..b70805a --- /dev/null +++ b/index.php @@ -0,0 +1,17 @@ +"; +$conn_string = "pgsql:host=localhost;port=5432;dbname=bitrixAppDb;user=kirill;password=bitrix24lib"; +try { + $db = new PDO($conn_string); + + // Установка режима обработки ошибок + $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + echo "Подключение к базе данных успешно установлено."; +}catch (PDOException $error) +{ + echo "Ошибка :". $error->getMessage(); +} + +?> From 6473c92ce8c704818538394fc7cc731d7c766be0 Mon Sep 17 00:00:00 2001 From: KarlsonComplete Date: Sun, 6 Oct 2024 09:57:54 +0300 Subject: [PATCH 3/3] =?UTF-8?q?-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20mbstring,zip,curl,bcmath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 11 ++++++++++- docker/php-fpm/Dockerfile | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a1f253a..f48b8bc 100644 --- a/Makefile +++ b/Makefile @@ -22,4 +22,13 @@ test-unit: vendor/bin/phpunit --testsuite unit_tests --display-warnings test-integration: - vendor/bin/phpunit --testsuite integration_tests --display-warnings \ No newline at end of file + vendor/bin/phpunit --testsuite integration_tests --display-warnings + + +# docker file + +docker-up: + docker compose up --build -d + +docker-down: + docker compose down --remove-orphans \ No newline at end of file diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 7d707ee..67daccf 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -1,10 +1,12 @@ FROM php:8.2-fpm-alpine - RUN set -ex \ && apk --no-cache add \ postgresql-dev \ - && docker-php-ext-install pdo pdo_pgsql + oniguruma-dev \ + libzip-dev \ + curl-dev \ + && docker-php-ext-install pdo pdo_pgsql mbstring zip curl bcmath WORKDIR /bitrix24-php-lib