Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination

.dockerignore

@@ -0,0 +1,12 @@
+.circleci
+.git
+.settings
+nodes_modules
+vendor
+
+
+
+
+
+
+

Dockerfile

@@ -1,5 +1,10 @@
-FROM php:7.0-fpm-stretch as builder
 
+#########################################################################
+# This image contains every build tools that will be used by the builder and
+# the app images (usefull in dev mode)
+#########################################################################
+
+FROM php:7.0-fpm-stretch as phraseanet-system
 RUN apt-get update \
     && apt-get install -y \
         apt-transport-https \
@@ -23,6 +28,7 @@ RUN apt-get update \
         libxslt-dev \
         libzmq3-dev \
         locales \
+        gettext \
         mcrypt \
         swftools \
         unoconv \
@@ -61,9 +67,19 @@ RUN mkdir /entrypoint /var/alchemy \
     && mkdir -p /home/app/.composer \
     && chown -R app: /home/app /var/alchemy
 
+#########################################################################
+# This image is used to build the apps
+#########################################################################
+
+FROM phraseanet-system as builder
+
 WORKDIR /var/alchemy/
 
+# Files that are needed at build stage
+
 COPY gulpfile.js /var/alchemy/
+COPY www/include /var/alchemy/www/include
+COPY www/scripts/apps /var/alchemy/www/scripts/apps
 COPY Makefile /var/alchemy/
 COPY package.json /var/alchemy/
 COPY phpunit.xml.dist /var/alchemy/
@@ -73,11 +89,16 @@ COPY composer.json /var/alchemy/
 COPY composer.lock /var/alchemy/
 RUN make install_composer
 COPY resources /var/alchemy/resources
-COPY www /var/alchemy/www
+
+# Application build phase
+
 RUN make clean_assets
 RUN make install_asset_dependencies
 RUN make install_assets
 
+# Application code
+
+COPY www /var/alchemy/www
 ADD ./docker/phraseanet/ /
 COPY lib /var/alchemy/lib
 COPY tmp /var/alchemy/tmp
@@ -86,6 +107,9 @@ COPY grammar /var/alchemy/grammar
 COPY templates-profiler /var/alchemy/templates-profiler
 COPY templates /var/alchemy/templates
 COPY tests /var/alchemy/tests
+
+# Create needed folders
+
 RUN mkdir -p /var/alchemy/Phraseanet/logs \
     && chmod -R 777 /var/alchemy/Phraseanet/logs \
     && mkdir -p /var/alchemy/Phraseanet/cache \
@@ -99,69 +123,11 @@ RUN mkdir -p /var/alchemy/Phraseanet/logs \
     && mkdir -p /var/alchemy/Phraseanet/config \
     && chmod -R 777 /var/alchemy/Phraseanet/config
 
-# Phraseanet
+#########################################################################
-FROM php:7.0-fpm-stretch as phraseanet-fpm
+# Phraseanet web application image
-RUN apt-get update \
+#########################################################################
-    && apt-get install -y \
-        apt-transport-https \
-        ca-certificates \
-        gnupg2 \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends zlib1g-dev \
-        gettext \
-        git \
-        ghostscript \
-        gpac \
-        imagemagick \
-        libav-tools \
-        libfreetype6-dev \
-        libicu-dev \
-        libjpeg62-turbo-dev \
-        libmagickwand-dev \
-        libmcrypt-dev \
-        libpng-dev \
-        librabbitmq-dev \
-        libssl-dev \
-        libxslt-dev \
-        libzmq3-dev \
-        locales \
-        mcrypt \
-        swftools \
-        unoconv \
-        unzip \
-        xpdf \
-    && update-locale "LANG=fr_FR.UTF-8 UTF-8" \
-    && dpkg-reconfigure --frontend noninteractive locales \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install -j$(nproc) gd \
-    && docker-php-ext-install zip exif iconv mbstring pcntl sockets xsl intl pdo_mysql gettext bcmath mcrypt \
-    && pecl install redis amqp-1.9.3 zmq-beta imagick-beta \
-    && docker-php-ext-enable redis amqp zmq imagick \
-    && pecl clear-cache \
-    && docker-php-source delete \
-    && rm -rf /var/lib/apt/lists/*
 
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+FROM phraseanet-system as phraseanet-fpm
-    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
-    && php -r "unlink('composer-setup.php');"
-
-# Node Installation (node + yarn)
-# Reference :
-# https://linuxize.com/post/how-to-install-node-js-on-ubuntu-18.04/
-# https://yarnpkg.com/lang/en/docs/install/#debian-stable
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-    && apt install -y nodejs \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update && apt-get install -y --no-install-recommends yarn \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/
-
-RUN mkdir /entrypoint /var/alchemy \
-    && useradd -u 1000 app \
-    && mkdir -p /home/app/.composer \
-    && chown -R app: /home/app /var/alchemy
 
 COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/ /
@@ -169,11 +135,17 @@ WORKDIR /var/alchemy/Phraseanet
 ENTRYPOINT ["/phraseanet-entrypoint.sh"]
 CMD ["/boot.sh"]
 
-# phraseanet-worker
+#########################################################################
+# Phraseanet worker application image
+#########################################################################
+
 FROM phraseanet-fpm as phraseanet-worker
 CMD ["/worker-boot.sh"]
 
+#########################################################################
 # phraseanet-nginx
+#########################################################################
+
 FROM nginx:1.15 as phraseanet-nginx
 RUN useradd -u 1000 app
 ADD ./docker/nginx/ /

Dockerfile-debug

@@ -1,18 +0,0 @@
-ARG phraseanet
-FROM $phraseanet
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        iproute2 \
-    && rm -rf /var/lib/apt/lists/* \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
-    && pecl clear-cache
-
-ADD ./docker/phraseanet-debug/ /
-
-RUN chmod +x /entrypoint.sh /usr/local/bin/docker-*
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["php-fpm"]

build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -xe
+
 # nginx server
 docker build --target phraseanet-nginx -t local/phraseanet-nginx:$1 .
 

lib/Alchemy/Phrasea/Core/Version.php

@@ -16,7 +16,7 @@ class Version
     /**
      * @var string
      */
-    private $number = '4.1.0-alpha.18a';
+    private $number = '4.1.0-alpha.19a';
 
     /**
      * @var string

lib/classes/patch/410alpha19a.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2019 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_410alpha19a implements patchInterface
+{
+    /** @var string */
+    private $release = '4.1.0-alpha.19a';
+
+    /** @var array */
+    private $concern = [base::APPLICATION_BOX];
+
+    /**
+     * Returns the release version.
+     *
+     * @return string
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDoctrineMigrations()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        // remove all and last in default query
+        $sql = "UPDATE UserSettings SET value = '' WHERE name = 'start_page_query' AND lower(trim(value)) in ('all','last')";
+        $stmt = $appbox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $stmt->closeCursor();
+
+        return true;
+    }
+}

package.json

@@ -65,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.80-d",
+    "phraseanet-production-client": "0.34.82-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",

templates/web/prod/actions/Push.html.twig

@@ -218,8 +218,8 @@
                                 </span>
                             </td>
                             <td class="options">
-                                <button class="select-all round-blue-border-btn" style="width: 128px; margin-right: 10px;">{{ 'Select all' | trans }}</button>
+                                <button class="select-all round-blue-border-btn" style="margin-right: 10px;">{{ 'Select all' | trans }}</button>
-                                <button class="unselect-all round-blue-border-btn" style="width: 128px;">{{ 'Deselect all' | trans }}</button>
+                                <button class="unselect-all round-blue-border-btn">{{ 'Deselect all' | trans }}</button>
                                 <button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
                             </td>
                         </tr>

yarn.lock

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.1:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.80-d:
+phraseanet-production-client@0.34.82-d:
-  version "0.34.80-d"
+  version "0.34.82-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.80-d.tgz#1e54bee4306ab11528377cb63c19d8c7491ef0f3"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.82-d.tgz#904f649ae4164c38b8f3a36be0bf33d98b99f739"
-  integrity sha512-ilGs7ndDNztwlyeW9MA2TMiMhZC+P1/lNNeIsIuh+KuJH8M3Y3SWBcmsN2lqu5iM1Xg5FbWJ6iXcCSrLWHTqsw==
+  integrity sha512-pofcyCNGbR/esbTxMkUGyn1M70PSsgcon/ZHRB6iHgFtgQKa4XUpDceGEtQqjMFPwB85d4sO8m9hgkLlC0pdIQ==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"