mirror of
https://github.com/hoellen/docker-nextcloud.git
synced 2025-04-22 13:39:25 +00:00
Compare commits
No commits in common. "beab287fc4838097120533a68f00897858b679a3" and "9b0a84a36f82aa3b4ea400ac317e0fc4c75b9dcb" have entirely different histories.
beab287fc4
...
9b0a84a36f
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
- name: Run Trivy vulnerability scanner
|
||||
uses: aquasecurity/trivy-action@master
|
||||
with:
|
||||
image-ref: 'ghcr.io/${{ github.actor }}/nextcloud'
|
||||
image-ref: 'ghcr.io/hoellen/nextcloud'
|
||||
format: 'template'
|
||||
template: '@/contrib/sarif.tpl'
|
||||
output: 'trivy-results.sarif'
|
||||
|
@ -4,7 +4,7 @@ ARG PHP_VERSION=8.0
|
||||
ARG NGINX_VERSION=1.20
|
||||
|
||||
ARG ALPINE_VERSION=3.15
|
||||
ARG HARDENED_MALLOC_VERSION=10
|
||||
ARG HARDENED_MALLOC_VERSION=8
|
||||
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
@ -94,7 +94,7 @@ FROM base as nextcloud
|
||||
|
||||
COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
|
||||
COPY --from=nginx /etc/nginx /etc/nginx
|
||||
COPY --from=build-malloc /tmp/hardened_malloc/out/libhardened_malloc.so /usr/local/lib/
|
||||
COPY --from=build-malloc /tmp/hardened_malloc/libhardened_malloc.so /usr/local/lib/
|
||||
|
||||
ARG NEXTCLOUD_VERSION
|
||||
ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
|
||||
|
@ -55,12 +55,6 @@ cat >> /nextcloud/config/autoconfig.php <<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..."
|
||||
# Execute setup
|
||||
(cd /nextcloud; php index.php &>/dev/null)
|
||||
|
Loading…
x
Reference in New Issue
Block a user