15 Commits

Author SHA1 Message Date
9cad43ff56 Update Nextcloud to 23.0.12 2022-12-08 15:28:45 +01:00
073ca00bf4 Update to 23.0.11 2022-11-03 18:35:38 +01:00
234d6354e9 Update Nextcloud to 23.0.10 2022-10-06 14:53:11 +02:00
acadfd905c Update Nextcloud to 23.0.9 2022-09-09 09:50:10 +02:00
f86b0b79d5 chore: update Nextcloud to 23.0.8 2022-08-12 08:17:21 +02:00
2bc7d31643 Update to 23.0.7 2022-07-19 19:02:39 +02:00
b372cdb499 Update Nextcloud to 23.0.6 2022-06-20 23:32:01 +02:00
e0f31f7fd0 Update to 23.0.5 2022-05-20 13:17:56 +02:00
3e538254d1 Update to 23.0.4 (Closes: #13) 2022-05-06 10:17:01 +02:00
7b65f2fb60 Create branch for version 23 2022-05-05 07:25:30 +02:00
feae76b13a Update Nextcloud to 23.0.3 2022-03-21 23:25:42 +01:00
51912688d2 Update Nextcloud to 23.0.2 2022-02-15 20:44:48 +01:00
9fbe35460b Update Nextcloud to 23.0.1 2022-01-27 21:07:18 +01:00
bc89ff25ed Update hardened_malloc to 11 2022-01-27 19:56:15 +01:00
d3bfe95eb4 use light variant of hardened malloc
Much lower memory usage, remains security-focused
2022-01-17 10:46:41 +01:00
2 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@ name: build
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ master ] branches: [ version-23 ]
schedule: schedule:
# Build the image regularly (each Friday) # Build the image regularly (each Friday)
- cron: '23 04 * * 5' - cron: '23 04 * * 5'
@ -19,7 +19,6 @@ jobs:
- name: Build an image from Dockerfile - name: Build an image from Dockerfile
run: | run: |
docker build \ docker build \
-t ghcr.io/${{ github.actor }}/nextcloud \
-t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) \ -t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) \
-t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) \ -t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) \
. .
@ -46,6 +45,6 @@ jobs:
- name: Push image to GitHub - name: Push image to GitHub
run: | run: |
docker push ghcr.io/${{ github.actor }}/nextcloud
docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)
docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)

View File

@ -1,10 +1,10 @@
# -------------- Build-time variables -------------- # -------------- Build-time variables --------------
ARG NEXTCLOUD_VERSION=23.0.0 ARG NEXTCLOUD_VERSION=23.0.12
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.15
ARG HARDENED_MALLOC_VERSION=10 ARG HARDENED_MALLOC_VERSION=11
ARG UID=1000 ARG UID=1000
ARG GID=1000 ARG GID=1000
@ -77,12 +77,13 @@ FROM alpine:${ALPINE_VERSION} as build-malloc
ARG HARDENED_MALLOC_VERSION ARG HARDENED_MALLOC_VERSION
ARG CONFIG_NATIVE=false ARG CONFIG_NATIVE=false
ARG VARIANT=light
RUN apk --no-cache add build-base git gnupg && cd /tmp \ RUN apk --no-cache add build-base git gnupg && cd /tmp \
&& wget -q https://github.com/thestinger.gpg && gpg --import thestinger.gpg \ && wget -q https://github.com/thestinger.gpg && gpg --import thestinger.gpg \
&& git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \ && git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \
&& cd hardened_malloc && git verify-tag $(git describe --tags) \ && cd hardened_malloc && git verify-tag $(git describe --tags) \
&& make CONFIG_NATIVE=${CONFIG_NATIVE} && make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT}
### Fetch nginx ### Fetch nginx
@ -94,7 +95,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/out/libhardened_malloc.so /usr/local/lib/ COPY --from=build-malloc /tmp/hardened_malloc/out-light/libhardened_malloc-light.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"
@ -110,7 +111,7 @@ ENV UPLOAD_MAX_SIZE=10G \
CRON_MEMORY_LIMIT=1g \ CRON_MEMORY_LIMIT=1g \
DB_TYPE=sqlite3 \ DB_TYPE=sqlite3 \
DOMAIN=localhost \ DOMAIN=localhost \
LD_PRELOAD="/usr/local/lib/libhardened_malloc.so /usr/lib/preloadable_libiconv.so" LD_PRELOAD="/usr/local/lib/libhardened_malloc-light.so /usr/lib/preloadable_libiconv.so"
RUN apk --no-cache add \ RUN apk --no-cache add \
gnupg \ gnupg \