Skip to content

Commit

Permalink
Merge 6.0 into master (#1734)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmleroux authored Feb 21, 2022
2 parents b14a26a + ef847e5 commit aad2ab1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ RUN echo 'APT::Install-Recommends "0" ; APT::Install-Suggests "0" ;' > /etc/apt/
apt-get clean && apt-get --yes --quiet autoremove --purge && \
rm -rf /var/lib/apt/lists/* /var/log/* /tmp/* /usr/share/locale/*

RUN pip3 install -U sphinx
RUN pip3 install --upgrade setuptools wheel
RUN pip3 install --upgrade sphinx

Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ daemons:
# Enable consumer #1 to be started at instance boot
partners_systemctl pim_onboarder_consumer@1 enable
# Enable worker #1 to be started at instance boot
partners_systemctl pim_onboarder_worker@1 enable
# Check the status of the daemon #1
partners_systemctl pim_onboarder_consumer@1 status
Expand Down
4 changes: 2 additions & 2 deletions contribute_to_pim/report_bug.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ Report a Bug
* Provides the PIM system information available under System > System information
* Provides as much information as possible on your environment (OS, PHP version, browser)

* Don't hesitate to claim your badge "Bug Hunter" on `badger <http://badger.akeneo.com/login>`_
* Don't hesitate to claim your badge "Bug Hunter" on `badger <https://badger.akeneo.com/login>`_

**Enterprise Edition**

* Gather as much information as possible by following our :doc:`/maintain_pim/bug_qualification/index` guide
* Raise an issue by using your `Service Desk Account <http://helpdesk.akeneo.com/>`_
* Raise an issue by using your `Service Desk Account <https://helpdesk.akeneo.com>`_
* Attach the PIM system information file to your request (it is available under System > System information > TXT)
* Submit your request on our Helpdesk
2 changes: 2 additions & 0 deletions install_pim/docker/installation_docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The following command will create a PIM project in the current directory. Please
$ mkdir pim
$ cd pim
$ docker run -ti -u www-data --rm \
-e COMPOSER_MEMORY_LIMIT=4G \
-v $(pwd):/srv/pim -v ~/.composer:/var/www/.composer -w /srv/pim \
akeneo/pim-php-dev:5.0 php /usr/local/bin/composer create-project \
akeneo/pim-community-standard /srv/pim "5.0.*@stable"
Expand All @@ -69,6 +70,7 @@ You need to get a PIM Enterprise Standard archive from the Partners Portal. See
$ tar -xvzf pim-enterprise-standard-v5.0.tar.gz
$ cd pim-enterprise-standard
$ docker run -ti -u www-data --rm \
-e COMPOSER_MEMORY_LIMIT=4G \
-v $(pwd):/srv/pim -v ~/.composer:/var/www/.composer -v ~/.ssh:/var/www/.ssh -w /srv/pim \
akeneo/pim-php-dev:master php /usr/local/bin/composer install
Expand Down
6 changes: 2 additions & 4 deletions maintain_pim/first_aid_kit/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Clear the PIM cache (also known as "Symfony cache") by running the following com
cd /path/to/your/pim/
php bin/console cache:clear --env=prod --no-warmup
You could use the command `partners_clear_cache` if you are on a Akeneo Cloud Offer. You can find more commands in our `_System Administration & Services Management page <https://docs.akeneo.com/4.0/cloud_edition/flexibility_mode/docs/system_administration.html>`__.

Step 9: did you consider the volume of your catalog?
Expand All @@ -107,7 +107,7 @@ Step 9: did you consider the volume of your catalog?

Each catalog is unique. How many channels, locales, attributes, families, categories, products and users do you have? These values may had increased drastically since you began using your PIM.

Most of this information can be found on the PIM under System > System information. Since 2.3 version, you have a dedicated page available under Activity menu, called Catalog Volume Monitoring, see our `_Help Center article <https://help.akeneo.com/pim/v3/articles/catalog-volume-monitoring.html#a-dedicated-screen>`__ for more information about this page and how to read it.
Most of this information can be found on the PIM under System > System information. Since 2.3 version, you have a dedicated page available under Activity menu, called Catalog Volume Monitoring, see our `_Help Center article <https://help.akeneo.com/pim/v3/articles/catalog-volume-monitoring.html#a-dedicated-screen>`__ for more information about this page and how to read it.

You can also read this Medium article `_Because your product catalog typology matters <https://medium.com/akeneo-labs/because-your-product-catalog-typology-matters-e1a9af4c33e0>`__ to see the impacts catalog modeling can have on PIM performances.

Expand All @@ -127,8 +127,6 @@ Disable all custom developments by commenting them in the "AppKernel.php" file `
And then, re-apply `Step 7: are your assets properly deployed?`_ and `Step 8: did you clear the cache?`_

Alternatively, you can check if the issue is reproducible on `Demo website <http://demo.akeneo.com/user/login>`_ (only for the latest PIM version).

Does the bug persist?
---------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Software
--------

+-------------------+------------------------------------------------------------------------------------------------------------+
| Debian (Linux) | 10 (64 bits) |
| Debian (Linux) | 10 (64 bits) |
+-------------------+------------------------------------------------------------------------------------------------------------+
| or Ubuntu | 18.04 (64 bits) |
+-------------------+------------------------------------------------------------------------------------------------------------+
Expand All @@ -22,7 +22,7 @@ Software
+-------------------+------------------------------------------------------------------------------------------------------------+
| MySQL | 8.0 |
+-------------------+------------------------------------------------------------------------------------------------------------+
| Elasticsearch | 7.4 ≤ version |
| Elasticsearch | 7.4 ≤ version |
+-------------------+------------------------------------------------------------------------------------------------------------+

.. warning::
Expand Down

0 comments on commit aad2ab1

Please sign in to comment.