CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Daniel Del Rio Figueira 2021-03-08 12:40:37 +01:00
parent 7c921f4da1 07e08d0b6f
commit bcff86afef
No known key found for this signature in database
GPG Key ID: DCB25219AF061D1B
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/supervisor/cron.conf.rootless
View File

@ -1,5 +1,5 @@
[program:cron] [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 autostart=true
priority=20 priority=20
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout

6
debian/Dockerfile.rootless vendored
View File

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

4
docker-compose-pro.yml
View File

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

4
docker-compose.yml
View File

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

2
env/passbolt.env vendored
View File

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