Merge branch 'feature/fix-non-root-supervisord-conf' into develop

conf/supervisor/cron.conf.rootless

@@ -1,5 +1,5 @@
 [program:cron]
-command=/usr/local/bin/supercronic /etc/cron.d/passbolt-ce-server
+command=/usr/local/bin/supercronic /etc/cron.d/__PASSBOLT_PACKAGE__
 autostart=true
 priority=20
 stdout_logfile=/dev/stdout

debian/Dockerfile.rootless

@@ -34,6 +34,8 @@ RUN apt-get update \
     && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
     && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
 
+COPY conf/supervisor/cron.conf.rootless /etc/supervisor/conf.d/cron.conf
+
 RUN sed -i 's,listen 80;,listen 8080;,' /etc/nginx/sites-enabled/nginx-passbolt.conf \
     && rm /etc/nginx/sites-enabled/default \
     && cp /usr/share/passbolt/examples/nginx-passbolt-ssl.conf /etc/nginx/snippets/passbolt-ssl.conf \
@@ -66,9 +68,9 @@ RUN sed -i 's,listen 80;,listen 8080;,' /etc/nginx/sites-enabled/nginx-passbolt.
     && chown -R www-data:0 /var/log/supervisor \
     && touch /var/www/.profile \
     && chown www-data:www-data /var/www/.profile \
-    && sed -i 's,www-data\s,,' /etc/cron.d/$PASSBOLT_PKG
+    && sed -i 's,www-data\s,,' /etc/cron.d/$PASSBOLT_PKG \
+    && sed -i "s,__PASSBOLT_PACKAGE__,$PASSBOLT_PKG," /etc/supervisor/conf.d/cron.conf
 
-COPY conf/supervisor/cron.conf.rootless /etc/supervisor/conf.d/cron.conf
 COPY conf/supervisor/nginx.conf /etc/supervisor/conf.d/nginx.conf
 COPY conf/supervisor/php.conf /etc/supervisor/conf.d/php.conf
 COPY debian/bin/docker-entrypoint.sh.rootless /docker-entrypoint.sh

docker-compose-pro.yml

@@ -10,9 +10,9 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:3.0.1-pro
+    image: passbolt/passbolt:latest-pro
     #Alternatively you can use rootless:
-    #image: passbolt/passbolt:3.0.0-pro-non-root
+    #image: passbolt/passbolt:latest-pro-non-root
     tty: true
     depends_on:
       - db

docker-compose.yml

@@ -10,9 +10,9 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:3.0.1-ce
+    image: passbolt/passbolt:latest-ce
     #Alternatively you can use rootless:
-    #image: passbolt/passbolt:3.0.0-ce-non-root
+    #image: passbolt/passbolt:latest-ce-non-root
     tty: true
     depends_on:
       - db

env/passbolt.env

@@ -1,7 +1,5 @@
 # URL
 APP_FULL_BASE_URL=https://passbolt.local
-# For rootless images
-#APP_FULL_BASE_URL=https://passbolt.local:4433
 
 # Database settings
 DATASOURCES_DEFAULT_HOST=db