Compare commits

...

3 Commits

Author SHA1 Message Date
beab287fc4 Update hardened malloc to 10 2022-01-13 20:05:21 +01:00
Jan Wagner
b839ac7838 Use github.actor also for trivy step 2022-01-13 19:38:14 +01:00
Jan Wagner
9851eb52ee waiting for the database container on setup 2022-01-13 19:35:53 +01:00
3 changed files with 9 additions and 3 deletions

View File

@ -27,7 +27,7 @@ jobs:
- name: Run Trivy vulnerability scanner - name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master uses: aquasecurity/trivy-action@master
with: with:
image-ref: 'ghcr.io/hoellen/nextcloud' image-ref: 'ghcr.io/${{ github.actor }}/nextcloud'
format: 'template' format: 'template'
template: '@/contrib/sarif.tpl' template: '@/contrib/sarif.tpl'
output: 'trivy-results.sarif' output: 'trivy-results.sarif'

View File

@ -4,7 +4,7 @@ ARG PHP_VERSION=8.0
ARG NGINX_VERSION=1.20 ARG NGINX_VERSION=1.20
ARG ALPINE_VERSION=3.15 ARG ALPINE_VERSION=3.15
ARG HARDENED_MALLOC_VERSION=8 ARG HARDENED_MALLOC_VERSION=10
ARG UID=1000 ARG UID=1000
ARG GID=1000 ARG GID=1000
@ -94,7 +94,7 @@ FROM base as nextcloud
COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
COPY --from=nginx /etc/nginx /etc/nginx COPY --from=nginx /etc/nginx /etc/nginx
COPY --from=build-malloc /tmp/hardened_malloc/libhardened_malloc.so /usr/local/lib/ COPY --from=build-malloc /tmp/hardened_malloc/out/libhardened_malloc.so /usr/local/lib/
ARG NEXTCLOUD_VERSION ARG NEXTCLOUD_VERSION
ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"

View File

@ -55,6 +55,12 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
?> ?>
EOF EOF
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
do
echo "waiting for the database container..."
sleep 1
done
echo "Starting automatic configuration..." echo "Starting automatic configuration..."
# Execute setup # Execute setup
(cd /nextcloud; php index.php &>/dev/null) (cd /nextcloud; php index.php &>/dev/null)