mirror of
https://github.com/hoellen/docker-nextcloud.git
synced 2025-07-04 17:16:11 +00:00
Compare commits
12 Commits
1c3827a2fa
...
version-27
Author | SHA1 | Date | |
---|---|---|---|
266855c572 | |||
ddc63fa70e | |||
208ed68fc3 | |||
fe44206881 | |||
6f10e62a16 | |||
d8fde6dc0a | |||
adf43bb5bf | |||
7422210f7c | |||
0221fa4f33 | |||
112339b5c8 | |||
2334b3e231 | |||
6adf9e6bf8 |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@ -3,7 +3,7 @@ name: build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ master ]
|
||||
branches: [ version-27 ]
|
||||
schedule:
|
||||
# Build the image regularly (each Friday)
|
||||
- cron: '23 04 * * 5'
|
||||
@ -34,7 +34,7 @@ jobs:
|
||||
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 +53,6 @@ jobs:
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
tags: |
|
||||
latest
|
||||
${{ env.FULL_VERSION }}
|
||||
${{ env.MAJOR_VERSION }}
|
||||
|
||||
@ -70,4 +69,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 }}
|
||||
|
@ -1,5 +1,5 @@
|
||||
# -------------- Build-time variables --------------
|
||||
ARG NEXTCLOUD_VERSION=27.1.2
|
||||
ARG NEXTCLOUD_VERSION=27.1.11
|
||||
ARG PHP_VERSION=8.2
|
||||
ARG NGINX_VERSION=1.24
|
||||
|
||||
@ -10,8 +10,8 @@ ARG SNUFFLEUPAGUS_VERSION=0.10.0
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
|
||||
# nextcloud-27.1.2.tar.bz2
|
||||
ARG SHA256_SUM="0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721"
|
||||
# nextcloud-27.1.11.tar.bz2
|
||||
ARG SHA256_SUM="4edd2570f4c83442f8f0f0616fb774ed2663b11cf9f6ea49e795ab43aeef9645"
|
||||
|
||||
# Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
|
||||
ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
|
||||
|
@ -49,7 +49,7 @@ server {
|
||||
return 404;
|
||||
}
|
||||
|
||||
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
|
||||
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy)\.php(?:$|\/) {
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
@ -62,7 +62,7 @@ server {
|
||||
fastcgi_read_timeout 1200;
|
||||
}
|
||||
|
||||
location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
|
||||
location ~ ^\/(?:updater|ocs-provider)(?:$|\/) {
|
||||
try_files $uri/ =404;
|
||||
index index.php;
|
||||
}
|
||||
|
@ -15,15 +15,6 @@ if [ "$PHP_HARDENING" == "true" ] && [ ! -f /usr/local/etc/php/conf.d/snuffleupa
|
||||
cp /usr/local/etc/php/snuffleupagus/* /usr/local/etc/php/conf.d
|
||||
fi
|
||||
|
||||
# Check if database is available
|
||||
if [ ${DB_TYPE} != "sqlite3" ]; then
|
||||
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
|
||||
do
|
||||
echo "waiting for the database container..."
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
|
||||
# If new install, run setup
|
||||
if [ ! -f /nextcloud/config/config.php ]; then
|
||||
touch /nextcloud/config/CAN_INSTALL
|
||||
|
@ -55,6 +55,14 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
|
||||
?>
|
||||
EOF
|
||||
|
||||
if [ ${DB_TYPE} != "sqlite3" ]; then
|
||||
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
|
||||
do
|
||||
echo "waiting for the database container..."
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
|
||||
echo "Starting automatic configuration..."
|
||||
# Execute setup
|
||||
(cd /nextcloud; php index.php &>/dev/null)
|
||||
|
Reference in New Issue
Block a user