From 4ab565404fdad42072780fefc5328a8fa5ad310f Mon Sep 17 00:00:00 2001 From: Vitor Mattos Date: Sun, 6 Feb 2022 11:05:56 -0300 Subject: [PATCH] Remove cfssl and java dependency --- .docker/app/Dockerfile | 7 ------- .docker/app/entrypoint.sh | 1 + docker-compose.yml | 11 ----------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 50c77b2532..e128890ad1 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -101,13 +101,6 @@ RUN echo "source ${NVM_DIR}/nvm.sh" > $HOME/.bashrc COPY --from=composer /usr/bin/composer /usr/bin/composer -# Install Java and JsignPDF -RUN mkdir -p /usr/share/man/man1 -RUN apt-get install -y default-jre -RUN curl -OL https://sourceforge.net/projects/jsignpdf/files/stable/JSignPdf%20${VERSION_JSIGNPDF}/jsignpdf-${VERSION_JSIGNPDF}.zip \ - && unzip jsignpdf-${VERSION_JSIGNPDF}.zip -d /opt \ - && rm jsignpdf-${VERSION_JSIGNPDF}.zip - RUN mkdir -p /cfssl ; chown -R www-data:www-data /cfssl VOLUME /cfssl diff --git a/.docker/app/entrypoint.sh b/.docker/app/entrypoint.sh index 8f0b91805e..765d0a141d 100644 --- a/.docker/app/entrypoint.sh +++ b/.docker/app/entrypoint.sh @@ -14,5 +14,6 @@ if [[ ! -f "config/config.php" && ${AUTOINSTALL} -eq 1 ]]; then runuser -u www-data -- php occ maintenance:install --verbose --database=mysql --database-name=${MYSQL_DATABASE} --database-host=${MYSQL_HOST} --database-port= --database-user=${MYSQL_USER} --database-pass=${MYSQL_PASSWORD} --admin-user=${NEXTCLOUD_ADMIN_USER} --admin-pass=${NEXTCLOUD_ADMIN_PASSWORD} --admin-email=${NEXTCLOUD_ADMIN_EMAIL} fi runuser -u www-data -- php occ config:system:set default_phone_region ${DEFAULT_PHONE_REGION} + runuser -u www-data -- php occ config:system:set --value=1 allow_local_remote_servers fi php-fpm diff --git a/docker-compose.yml b/docker-compose.yml index 376e081854..26c5e589b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,14 +81,3 @@ services: - ${MAILHOG_PORT}:8025 redis: image: redis - cfssl: - image: cfssl/cfssl - volumes: - - ./volumes/cfssl:/cfssl - working_dir: /cfssl - entrypoint: /bin/bash - ports: - - 8888:8888 - command: - - /cfssl/entrypoint.sh -