mirror of
https://github.com/hoellen/docker-nextcloud.git
synced 2025-07-01 07:36:08 +00:00
Compare commits
24 Commits
cedf7fc4c6
...
version-28
Author | SHA1 | Date | |
---|---|---|---|
aa9ed8ea18 | |||
2fc97b32a2 | |||
0e84ada3d1 | |||
0ed34272f4 | |||
da2e5d91a8 | |||
0cf21d8b99 | |||
0dccbacce4 | |||
78fde4ae34 | |||
3c7698f73d | |||
9901609c6b | |||
936f60c3d5 | |||
ab3bdd0e43 | |||
1528fc9a00 | |||
cb21fa369e | |||
35f8a4f1ae | |||
34f40fe438 | |||
aec283db22 | |||
6b6e52fbdc | |||
e0cb8643f0 | |||
314cc8016d | |||
4f112a4cdb | |||
18e11abda1 | |||
bf3c76a5f8 | |||
dec3a7f789 |
17
.github/workflows/build.yml
vendored
17
.github/workflows/build.yml
vendored
@ -3,7 +3,9 @@ name: build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ master ]
|
||||
branches:
|
||||
- master
|
||||
- version-*
|
||||
schedule:
|
||||
# Build the image regularly (each Friday)
|
||||
- cron: '23 04 * * 5'
|
||||
@ -27,14 +29,17 @@ jobs:
|
||||
|
||||
- name: Extract version for tags
|
||||
run: |
|
||||
echo "FULL_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)" >> $GITHUB_ENV
|
||||
echo "MAJOR_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)" >> $GITHUB_ENV
|
||||
BRANCH="${GITHUB_REF#refs/heads/}"
|
||||
VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile)
|
||||
[ "$BRANCH" = "master" ] && echo "BRANCH_VERSION=latest" >> $GITHUB_ENV
|
||||
echo "FULL_VERSION=${VERSION:0:7}" >> $GITHUB_ENV
|
||||
echo "MAJOR_VERSION=${VERSION:0:2}" >> $GITHUB_ENV
|
||||
|
||||
- name: Install cosign
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: sigstore/cosign-installer@main
|
||||
with:
|
||||
cosign-release: 'v1.13.1'
|
||||
cosign-release: 'v2.2.2'
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
@ -53,7 +58,7 @@ jobs:
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
latest
|
||||
${{ env.BRANCH_VERSION }}
|
||||
${{ env.FULL_VERSION }}
|
||||
${{ env.MAJOR_VERSION }}
|
||||
|
||||
@ -70,4 +75,4 @@ jobs:
|
||||
if: ${{ github.event_name != 'pull_request' }}
|
||||
env:
|
||||
COSIGN_EXPERIMENTAL: "true"
|
||||
run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
|
||||
run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
|
||||
|
17
Dockerfile
17
Dockerfile
@ -1,24 +1,24 @@
|
||||
# -------------- Build-time variables --------------
|
||||
ARG NEXTCLOUD_VERSION=28.0.1
|
||||
ARG NEXTCLOUD_VERSION=28.0.14
|
||||
ARG PHP_VERSION=8.2
|
||||
ARG NGINX_VERSION=1.24
|
||||
ARG NGINX_VERSION=1.26
|
||||
|
||||
ARG ALPINE_VERSION=3.18
|
||||
ARG ALPINE_VERSION=3.20
|
||||
ARG HARDENED_MALLOC_VERSION=11
|
||||
ARG SNUFFLEUPAGUS_VERSION=0.10.0
|
||||
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
|
||||
# nextcloud-28.0.1.tar.bz2
|
||||
ARG SHA256_SUM="2f80735b443082272fe6a3b5e32137957f1fc448c75342b94b5200b29725f3a4"
|
||||
# nextcloud-28.0.14.tar.bz2
|
||||
ARG SHA256_SUM="4a937f1882486426c9703e59ec4b293f621be8d080b7f85016f629903c3af336"
|
||||
|
||||
# Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
|
||||
ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
|
||||
# ---------------------------------------------------
|
||||
|
||||
### Build PHP base
|
||||
FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as base
|
||||
FROM docker.io/library/php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as base
|
||||
|
||||
ARG SNUFFLEUPAGUS_VERSION
|
||||
|
||||
@ -43,6 +43,7 @@ RUN apk -U upgrade \
|
||||
gmp \
|
||||
icu \
|
||||
libjpeg-turbo \
|
||||
librsvg \
|
||||
libpq \
|
||||
libpq \
|
||||
libwebp \
|
||||
@ -84,7 +85,7 @@ RUN apk -U upgrade \
|
||||
|
||||
### Build Hardened Malloc
|
||||
ARG ALPINE_VERSION
|
||||
FROM alpine:${ALPINE_VERSION} as build-malloc
|
||||
FROM docker.io/library/alpine:${ALPINE_VERSION} as build-malloc
|
||||
|
||||
ARG HARDENED_MALLOC_VERSION
|
||||
ARG CONFIG_NATIVE=false
|
||||
@ -98,7 +99,7 @@ RUN apk --no-cache add build-base git gnupg && cd /tmp \
|
||||
|
||||
|
||||
### Fetch nginx
|
||||
FROM nginx:${NGINX_VERSION}-alpine as nginx
|
||||
FROM docker.io/library/nginx:${NGINX_VERSION}-alpine as nginx
|
||||
|
||||
|
||||
### Build Nextcloud (production environemnt)
|
||||
|
@ -9,7 +9,7 @@ and will receive the minor version updates and security patches.
|
||||
| ------- | ------------------ |
|
||||
| 28. x | :white_check_mark: |
|
||||
| 27. x | :white_check_mark: |
|
||||
| 26. x | :white_check_mark: |
|
||||
| 26. x | :negative_squared_cross_mark: |
|
||||
| 25. x | :negative_squared_cross_mark: |
|
||||
| 24. x | :negative_squared_cross_mark: |
|
||||
| 23. x | :negative_squared_cross_mark: |
|
||||
|
@ -18,7 +18,6 @@ server {
|
||||
|
||||
add_header Referrer-Policy "no-referrer" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
add_header X-Download-Options "noopen" always;
|
||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
@ -67,13 +66,13 @@ server {
|
||||
index index.php;
|
||||
}
|
||||
|
||||
location ~ \.(?:css|js|svg|gif|map)$ {
|
||||
location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
|
||||
try_files $uri /index.php$uri$is_args$args;
|
||||
expires 6M;
|
||||
access_log off;
|
||||
}
|
||||
|
||||
location ~ \.woff2?$ {
|
||||
location ~ \.(otf|woff2)?$ {
|
||||
try_files $uri /index.php$uri$is_args$args;
|
||||
expires 7d;
|
||||
access_log off;
|
||||
|
@ -9,6 +9,11 @@ events {
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
# Add .mjs as a file extension for javascript
|
||||
# https://github.com/nextcloud/server/pull/36057
|
||||
types {
|
||||
application/javascript mjs;
|
||||
}
|
||||
default_type application/octet-stream;
|
||||
|
||||
access_log /nginx/logs/access.log combined;
|
||||
|
@ -17,7 +17,8 @@ fi
|
||||
|
||||
# Check if database is available
|
||||
if [ -n "${DB_TYPE}" ] && [ "${DB_TYPE}" != "sqlite3" ]; then
|
||||
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
|
||||
DB_PORT=${DB_PORT:-$( [ "${DB_TYPE}" = "pgsql" ] && echo 5432 || echo 3306 )}
|
||||
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT}"
|
||||
do
|
||||
echo "waiting for the database container..."
|
||||
sleep 1
|
||||
|
Reference in New Issue
Block a user