From a74c62298b0b8df9952638d3630cae44dd7b3039 Mon Sep 17 00:00:00 2001 From: kirostumm Date: Mon, 4 Dec 2023 17:42:43 +0300 Subject: [PATCH] =?utf8?q?=D0=91=D0=B8=D0=BB=D0=B4=20=D1=80=D0=B0=D0=B1?= =?utf8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B1=D0=B5=D0=B7=20=D0=B7?= =?utf8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BE=D0=B2,=20=D0=BD=D0=BE=20?= =?utf8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=BD=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- docker/php/Dockerfile | 27 ++++++------------------ erp24/build.js | 2 +- erp24/views/layouts/api2_menu.php | 2 +- erp24/web/css/common/azea.scss | 2 +- erp24/web/js/common/perfect-scrollbar.js | 2 +- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index e827fe8..d9d401b 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-rc-fpm-alpine as app +FROM php:7.4-rc-fpm-alpine # Install tools required for build stage RUN apk add --update --no-cache \ bash curl wget rsync ca-certificates openssl openssh git tzdata openntpd \ @@ -9,32 +9,19 @@ RUN apk add --no-cache zlib libpng icu \ && docker-php-ext-install -j$(nproc) gd mysqli pdo pdo_mysql intl calendar opcache \ && apk del .deps +RUN apk --no-cache --update --repository http://dl-cdn.alpinelinux.org/alpine/v$ALPINE_VERSION/main/ add \ + postgresql-dev +RUN docker-php-ext-install pdo_pgsql + #add composer RUN wget https://getcomposer.org/installer \ && php installer \ && mv composer.phar /usr/local/bin/composer \ && rm installer -# Для поддержки jpg в gd из докер контейнера нужно запустить: -RUN apk add zlib-dev libpng-dev libjpeg jpeg-dev freetype-dev \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) gd - #add xdebug RUN apk add --no-cache $PHPIZE_DEPS \ -# && pecl install xdebug \ -# && docker-php-ext-enable xdebug \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ && apk del $PHPIZE_DEPS WORKDIR /www - -FROM app as app_dev - -ENV XDEBUG_MODE=off - -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ - -RUN set -eux; \ - install-php-extensions xdebug - -# Для перезагрузки nginx: -# kill -USR2 1 \ No newline at end of file diff --git a/erp24/build.js b/erp24/build.js index d690417..4a47a98 100644 --- a/erp24/build.js +++ b/erp24/build.js @@ -4,7 +4,7 @@ const sassPlugin = require('esbuild-plugin-sass'); const config = { production: process.env.NODE_ENV === 'prod', vendorPath: './node_modules/', - inputPath: './', + inputPath: './web/', outputPath: './web/' + (process.env.NODE_ENV === 'prod' ? 'dist-prod' : 'dist') }; diff --git a/erp24/views/layouts/api2_menu.php b/erp24/views/layouts/api2_menu.php index 18e16f0..2f5389a 100644 --- a/erp24/views/layouts/api2_menu.php +++ b/erp24/views/layouts/api2_menu.php @@ -4,4 +4,4 @@ $this->registerJS(" var ADMIN_ID = " . (Yii::$app->user->id ?? 0) . "; ", \yii\web\View::POS_BEGIN, 'api2_menu_init_global_vars'); -$this->registerJsFile('/js/site/get_menu.js', ['position' => \yii\web\View::POS_END]); +//$this->registerJsFile('/js/site/get_menu.js', ['position' => \yii\web\View::POS_END]); diff --git a/erp24/web/css/common/azea.scss b/erp24/web/css/common/azea.scss index c06b476..0d3ef9d 100755 --- a/erp24/web/css/common/azea.scss +++ b/erp24/web/css/common/azea.scss @@ -28,4 +28,4 @@ //@import "../../../azea/assets/plugins/accordion/accordion.css"; //@import "../../../azea/assets/css/icons.css"; //@import "../../../azea/assets/css/sortable.css"; -@import "../../web/azea/assets/colors/color1"; +@import "../../azea/assets/colors/color1"; diff --git a/erp24/web/js/common/perfect-scrollbar.js b/erp24/web/js/common/perfect-scrollbar.js index 748c5d2..7ef9b92 100755 --- a/erp24/web/js/common/perfect-scrollbar.js +++ b/erp24/web/js/common/perfect-scrollbar.js @@ -1,4 +1,4 @@ -import PerfectScrollbar from '../../web/azea/assets/plugins/p-scrollbar/p-scrollbar.js'; +import PerfectScrollbar from './../../azea/assets/plugins/p-scrollbar/p-scrollbar.js'; document.addEventListener('DOMContentLoaded', () => { let selectors = ['.app-sidebar', '.message-menu', '.notify-menu']; -- 2.39.5