develop #13

Merged
glenux merged 9 commits from develop into master 2025-01-12 14:33:42 +00:00
2 changed files with 7 additions and 5 deletions
Showing only changes of commit c6c36e877d - Show all commits

View file

@ -24,7 +24,7 @@ steps:
from_secret: DOCKERHUB_USERNAME from_secret: DOCKERHUB_USERNAME
password: password:
from_secret: DOCKERHUB_PASSWORD from_secret: DOCKERHUB_PASSWORD
cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}" cache_from: "glenux/service-nextcloud:${DRONE_BRANCH/\\//-}_latest"
repo: glenux/service-nextcloud repo: glenux/service-nextcloud
tags: "${DRONE_COMMIT_SHA:0:8}" tags: "${DRONE_COMMIT_SHA:0:8}"
purge: false purge: false
@ -43,9 +43,9 @@ steps:
from_secret: DOCKERHUB_PASSWORD from_secret: DOCKERHUB_PASSWORD
cache_from: cache_from:
- "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}" - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}"
- "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}" - "glenux/service-nextcloud:${DRONE_BRANCH/\\//-}_latest"
repo: glenux/service-nextcloud repo: glenux/service-nextcloud
tags: "latest_${DRONE_BRANCH/\\//-}" tags: "${DRONE_BRANCH/\\//-}_latest"
purge: false purge: false
when: when:
branch: branch:
@ -64,7 +64,7 @@ steps:
from_secret: DOCKERHUB_PASSWORD from_secret: DOCKERHUB_PASSWORD
cache_from: cache_from:
- "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}" - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}"
- "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}" - "glenux/service-nextcloud:${DRONE_BRANCH/\\//-}_latest"
repo: glenux/service-nextcloud repo: glenux/service-nextcloud
tags: latest tags: latest
purge: false purge: false

View file

@ -23,9 +23,11 @@ FROM nextcloud:29.0.3-apache
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
clamdscan nano ghostscript jq \ nano ghostscript \
&& apt-get clean && apt-get clean
# clamdscan
# #
## Enable REDIS extension ## Enable REDIS extension
# RUN pecl channel-update pecl.php.net \ # RUN pecl channel-update pecl.php.net \