Commit 89a158cd authored by Piotr Borek's avatar Piotr Borek
Browse files

version which is finishing build

parent b3518322
Pipeline #250974700 failed with stages
in 6 minutes and 26 seconds
......@@ -5,7 +5,7 @@
######################################################################
#--- Akeneo base ---
FROM akeneo/fpm:php-7.2 as akeneo
FROM akeneo/fpm:php-7.3 as akeneo
LABEL maintainer="josh.zamor@villagereach.org"
ARG AKENEO_URL=https://github.com/akeneo/pim-community-standard/archive/
ARG AKENEO_VER
......@@ -43,8 +43,8 @@ ADD --chown=docker:docker docker/pim/cpFromTmp.sh /srv/pim/
ADD --chown=docker:docker docker/pim/cronRun.sh /srv/pim/
ADD --chown=docker:docker docker/pim/pcmtMigrate.sh /srv/pim/
RUN src/cleanIfRelease.sh ${PCMT_SEMVER} && \
php -d memory_limit=3G /usr/local/bin/composer install && \
#RUN src/cleanIfRelease.sh ${PCMT_SEMVER} && \
RUN php -d memory_limit=-1 /usr/local/bin/composer update && \
rm -rf var/cache/* && \
mkdir -p /srv/pim/app/file_storage/catalog && \
mkdir -p /srv/pim/app/uploads/product /srv/pim/app/archive && \
......@@ -60,22 +60,22 @@ COPY --from=pim-build --chown=node:node /srv/pim /srv/pim
WORKDIR /srv/pim
ENV YARN_CACHE_FOLDER ${YARN_CACHE_PATH}docker
RUN yarn install && \
yarn run less && \
yarn run webpack-dev
#RUN yarn install && \
# yarn run less && \
# yarn run webpack-dev
#--- Httpd ---
FROM httpd:2.4 as httpd
LABEL maintainer="josh.zamor@villagereach.org"
COPY --from=node --chown=root:www-data /srv/pim/docker/httpd.conf /usr/local/apache2/conf/httpd.conf
COPY --from=node --chown=root:www-data /srv/pim/docker/akeneo.conf /usr/local/apache2/conf/vhost.conf
#COPY --from=node --chown=root:www-data /srv/pim/docker/httpd.conf /usr/local/apache2/conf/httpd.conf
#COPY --from=node --chown=root:www-data /srv/pim/docker/akeneo.conf /usr/local/apache2/conf/vhost.conf
# pim
FROM pim-build as pim
# xdebug.ini file is in some way overwritten later, so we needed to put our config directly into conf.d.
# ADD --chown=docker:docker ini/xdebug.ini /etc/php/7.2/mods-available/xdebug.ini
ADD --chown=docker:docker ini/xdebug.ini /etc/php/7.2/cli/conf.d/35-xdebug.ini
ADD --chown=docker:docker ini/xdebug.ini /etc/php/7.3/cli/conf.d/35-xdebug.ini
COPY --from=node --chown=docker:docker /srv/pim /srv/pim
VOLUME /srv/pim
......
......@@ -15,7 +15,7 @@ function cleanup {
}
trap cleanup EXIT
AKENEO_VER="v3.2.75"
AKENEO_VER="v4.0.86"
# Path of this script
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
......
......@@ -18,10 +18,8 @@
"Pcmt\\": "src/Pcmt/",
"Pim\\Upgrade\\": "upgrades/"
},
"classmap": [ "app/AppKernel.php", "app/AppCache.php" ],
"exclude-from-classmap": [
"vendor/akeneo/pim-community-dev/app/AppKernel.php",
"vendor/akeneo/pim-community-dev/app/AppCache.php"
"vendor/akeneo/pim-community-dev/src/Kernel.php"
]
},
"repositories": [
......@@ -45,77 +43,24 @@
}
],
"require": {
"php": ">=7.2.0",
"akeneo-labs/custom-entity-bundle": "3.0.*",
"akeneo/pim-community-dev": "3.2.75",
"php-http/guzzle6-adapter": "^2.0",
"sabre/xml": "^2.1",
"phpoffice/phpspreadsheet": "1.9.0",
"nesbot/carbon": "^2.25",
"behat/mink-extension": "^2.3",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"symfony/yaml": "^3.0",
"symfony/finder": "^3.0",
"damiankryger/akeneo-table-attribute-bundle": "dev-pcmt"
"akeneo/pim-community-dev": "^4.0.86"
},
"require-dev": {
"doctrine/migrations": "1.5.0",
"doctrine/doctrine-migrations-bundle": "1.2.1",
"symfony/profiler-pack": "^1.0",
"symfony/maker-bundle": "^1.12",
"symfony/phpunit-bridge": "^4.3",
"phpunit/phpunit": "^8",
"symplify/easy-coding-standard": "^6.1",
"infection/infection": "^0.13",
"behat/mink": "^1.7",
"behat/symfony2-extension": "^2.1",
"behatch/contexts": "^3.3",
"coduo/php-matcher": "^4.0",
"behat/mink-browserkit-driver": "^1.3",
"doctrine/doctrine-fixtures-bundle": "^2.3.0"
"doctrine/doctrine-migrations-bundle": "1.3.2",
"symfony/debug-bundle": "^4.4.7",
"symfony/web-profiler-bundle": "^4.4.7",
"symfony/web-server-bundle": "^4.4.7"
},
"scripts": {
"symfony-scripts": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget",
"php bin/console --ansi fos:js-routing:dump --target=web/js/routes.js",
"php bin/console --ansi pim:installer:assets"
"post-update-cmd": [
"bash vendor/akeneo/pim-community-dev/std-build/install-required-files.sh"
],
"post-install-cmd": [
"@symfony-scripts"
"bash vendor/akeneo/pim-community-dev/std-build/install-required-files.sh"
],
"post-update-cmd": [
"@symfony-scripts",
"Akeneo\\Platform\\Bundle\\InstallerBundle\\ComposerScripts::copyUpgradesFiles"
"post-create-project-cmd": [
"bash vendor/akeneo/pim-community-dev/std-build/install-required-files.sh"
]
},
"minimum-stability": "stable",
"extra": {
"symfony-app-dir": "app",
"symfony-bin-dir": "bin",
"symfony-var-dir": "var",
"symfony-web-dir": "web",
"symfony-assets-install": "relative",
"incenteev-parameters": {
"keep-outdated": true,
"file": "app/config/parameters.yml",
"env-map": {
"database_host": "PIM_DATABASE_HOST",
"database_port": "PIM_DATABASE_PORT",
"database_name": "PIM_DATABASE_NAME",
"database_user": "PIM_DATABASE_USER",
"database_password": "PIM_DATABASE_PASSWORD",
"index_hosts": "PIM_INDEX_HOSTS"
}
},
"branch-alias": {
"dev-master": "3.2.x-dev"
}
}
"minimum-stability": "stable"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment