diff --git a/.github/workflows/simplerisk-jammy-push_to_github.yml b/.github/workflows/simplerisk-jammy-push_to_github.yml index 6a71fb7..9295985 100644 --- a/.github/workflows/simplerisk-jammy-push_to_github.yml +++ b/.github/workflows/simplerisk-jammy-push_to_github.yml @@ -6,6 +6,7 @@ name: Docker # documentation. on: + workflow_dispatch: push: branches: [ "master" ] # Publish semver tags as releases. diff --git a/.github/workflows/simplerisk-jammy.yml b/.github/workflows/simplerisk-jammy.yml index c086201..d64b94e 100644 --- a/.github/workflows/simplerisk-jammy.yml +++ b/.github/workflows/simplerisk-jammy.yml @@ -34,4 +34,5 @@ jobs: with: image: ${{ env.IMAGE_TAG }} only-fixed: true + output-format: table severity-cutoff: critical diff --git a/.github/workflows/simplerisk-minimal-php81-push_to_github.yml b/.github/workflows/simplerisk-minimal-php81-push_to_github.yml index 95d93a4..fd0dec3 100644 --- a/.github/workflows/simplerisk-minimal-php81-push_to_github.yml +++ b/.github/workflows/simplerisk-minimal-php81-push_to_github.yml @@ -6,6 +6,7 @@ name: Docker # documentation. on: + workflow_dispatch: push: branches: [ "master" ] # Publish semver tags as releases. diff --git a/.github/workflows/simplerisk-minimal-php81.yml b/.github/workflows/simplerisk-minimal-php81.yml index 9a594db..b475957 100644 --- a/.github/workflows/simplerisk-minimal-php81.yml +++ b/.github/workflows/simplerisk-minimal-php81.yml @@ -34,4 +34,5 @@ jobs: with: image: ${{ env.IMAGE_TAG }} only-fixed: true + output-format: table severity-cutoff: critical diff --git a/simplerisk-minimal/generate_dockerfile.sh b/simplerisk-minimal/generate_dockerfile.sh index 9d1c2d3..f276190 100755 --- a/simplerisk-minimal/generate_dockerfile.sh +++ b/simplerisk-minimal/generate_dockerfile.sh @@ -64,7 +64,6 @@ RUN echo 'upload_max_filesize = 5M' >> /usr/local/etc/php/conf.d/docker-php-uplo echo 'log_errors = On' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \\ echo 'error_log = /dev/stderr' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \\ echo 'display_errors = Off' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \\ - # Create SSL Certificates for Apache SSL echo \$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c\${1:-32}) > /tmp/pass_openssl.txt && \\ mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \\ diff --git a/simplerisk-minimal/php81/Dockerfile b/simplerisk-minimal/php81/Dockerfile index f38be2e..02bd6eb 100644 --- a/simplerisk-minimal/php81/Dockerfile +++ b/simplerisk-minimal/php81/Dockerfile @@ -49,7 +49,6 @@ RUN echo 'upload_max_filesize = 5M' >> /usr/local/etc/php/conf.d/docker-php-uplo echo 'log_errors = On' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \ echo 'error_log = /dev/stderr' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \ echo 'display_errors = Off' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \ - # Create SSL Certificates for Apache SSL echo $(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32}) > /tmp/pass_openssl.txt && \ mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \