diff --git a/.drone.yml b/.drone.yml index 0ac15a2..c2b0461 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: from_secret: DOCKERHUB_USERNAME 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 tags: "${DRONE_COMMIT_SHA:0:8}" purge: false @@ -43,9 +43,9 @@ steps: from_secret: DOCKERHUB_PASSWORD cache_from: - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}" - - "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}" + - "glenux/service-nextcloud:${DRONE_BRANCH/\\//-}_latest" repo: glenux/service-nextcloud - tags: "latest_${DRONE_BRANCH/\\//-}" + tags: "${DRONE_BRANCH/\\//-}_latest" purge: false when: branch: @@ -64,7 +64,7 @@ steps: from_secret: DOCKERHUB_PASSWORD cache_from: - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}" - - "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}" + - "glenux/service-nextcloud:${DRONE_BRANCH/\\//-}_latest" repo: glenux/service-nextcloud tags: latest purge: false diff --git a/Dockerfile b/Dockerfile index e414e19..08630bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,9 +23,11 @@ FROM nextcloud:29.0.3-apache RUN apt-get update \ && apt-get install -y --no-install-recommends \ - clamdscan nano ghostscript jq \ + nano ghostscript \ && apt-get clean +# clamdscan + # ## Enable REDIS extension # RUN pecl channel-update pecl.php.net \