Compare commits

..

No commits in common. "90381a94d0da7fb14506b11740239076ee9081cd" and "3a563dd4e24c4e730c0d94316f20dc6f1f0573f7" have entirely different histories.

4 changed files with 13 additions and 23 deletions

View File

@ -3,10 +3,10 @@ name: build
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ master ] branches: [ main ]
schedule: schedule:
# Build the image regularly (each Friday) # Build the image regularly (each Friday)
- cron: '23 04 * * 5' - cron: '13 23 * * 5'
jobs: jobs:
build: build:
@ -34,10 +34,10 @@ jobs:
severity: 'CRITICAL,HIGH' severity: 'CRITICAL,HIGH'
vuln-type: "os" vuln-type: "os"
- name: Upload Trivy scan results to GitHub Security tab # - name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v1 # uses: github/codeql-action/upload-sarif@v1
with: # with:
sarif_file: 'trivy-results.sarif' # sarif_file: 'trivy-results.sarif'
- name: Login to the registry - name: Login to the registry
run: >- run: >-

View File

@ -3,7 +3,7 @@ ARG NEXTCLOUD_VERSION=22.2.3
ARG PHP_VERSION=8.0 ARG PHP_VERSION=8.0
ARG NGINX_VERSION=1.20 ARG NGINX_VERSION=1.20
ARG ALPINE_VERSION=3.15 ARG ALPINE_VERSION=3.14
ARG HARDENED_MALLOC_VERSION=8 ARG HARDENED_MALLOC_VERSION=8
ARG UID=1000 ARG UID=1000
@ -28,8 +28,6 @@ RUN apk -U upgrade \
libzip-dev \ libzip-dev \
openldap-dev \ openldap-dev \
postgresql-dev \ postgresql-dev \
samba-dev \
imagemagick-dev \
zlib-dev \ zlib-dev \
&& apk --no-cache add \ && apk --no-cache add \
freetype \ freetype \
@ -40,10 +38,7 @@ RUN apk -U upgrade \
libpq \ libpq \
libwebp \ libwebp \
libzip \ libzip \
libsmbclient \
openldap \ openldap \
libgomp \
imagemagick \
zlib \ zlib \
&& docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \ && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
&& docker-php-ext-configure ldap \ && docker-php-ext-configure ldap \
@ -59,14 +54,9 @@ RUN apk -U upgrade \
pdo_pgsql \ pdo_pgsql \
zip \ zip \
gmp \ gmp \
&& pecl install smbclient \
&& pecl install APCu \ && pecl install APCu \
&& pecl install redis \ && pecl install redis \
&& pecl install imagick \ && echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini \
&& docker-php-ext-enable \
smbclient \
redis \
imagick \
&& apk del build-deps \ && apk del build-deps \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*

View File

@ -4,7 +4,7 @@
Nextcloud [official website](https://nextcloud.com/) and [source code](https://github.com/nextcloud). Nextcloud [official website](https://nextcloud.com/) and [source code](https://github.com/nextcloud).
## Why this image? ## Why this image?
This non-official image is intended as an **all-in-one** (as in monolithic) Nextcloud **production** image. It is based on the [Wondefall/docker-nextcloud](https://github.com/Wonderfall/docker-nextcloud) image. If you're not sure you want this image, you should probably use [the official image](https://hub.docker.com/r/nextcloud). This non-official image is intended as an **all-in-one** (as in monolithic) Nextcloud **production** image. If you're not sure you want this image, you should probably use [the official image](https://hub.docker.com/r/nextcloud).
## Security ## Security
Don't run random images from random dudes on the Internet. Ideally, you want to maintain and build it yourself. Don't run random images from random dudes on the Internet. Ideally, you want to maintain and build it yourself.

View File

@ -30,10 +30,10 @@ server {
access_log off; access_log off;
} }
location ^~ /.well-known { location /.well-known {
location = /.well-known/carddav { return 301 $nc_proto://$host/remote.php/dav; } location = /.well-known/carddav { return 301 $nc_proto://$host:$nc_port/remote.php/dav; }
location = /.well-known/caldav { return 301 $nc_proto://$host/remote.php/dav; } location = /.well-known/caldav { return 301 $nc_proto://$host:$nc_port/remote.php/dav; }
location ^~ /.well-known { return 301 $nc_proto://$host/index.php$uri; } location ^~ /.well-known { return 301 $nc_proto://$host:$nc_port/index.php$uri; }
try_files $uri $uri/ =404; try_files $uri $uri/ =404;
} }