From f4c0042ab2aaedb815f3f2692c30c0c655e233ed Mon Sep 17 00:00:00 2001 From: paspo Date: Sun, 16 Jun 2024 16:21:32 +0200 Subject: [PATCH] packages upgrade --- .drone.yml | 11 ++--------- Dockerfile | 3 ++- manifest.tmpl | 6 +++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index f104cd8..cfc5ef9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,9 +29,7 @@ steps: username: from_secret: docker_username tags: - - ${DRONE_TAG}-linux-amd64 - - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-linux-amd64 - - ${DRONE_SEMVER_MAJOR}-linux-amd64 + - latest-linux-amd64 when: event: - tag @@ -69,9 +67,7 @@ steps: username: from_secret: docker_username tags: - - ${DRONE_TAG}-linux-arm64 - - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-linux-arm64 - - ${DRONE_SEMVER_MAJOR}-linux-arm64 + - latest-linux-arm64 when: event: - tag @@ -95,9 +91,6 @@ steps: from_secret: docker_password tags: - latest - - ${DRONE_TAG} - - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR} - - ${DRONE_SEMVER_MAJOR} when: event: - tag diff --git a/Dockerfile b/Dockerfile index 28be26c..e6d5a91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM alpine:latest RUN \ - apk -U add proftpd proftpd-mod_tls proftpd-mod_ifsession \ + apk --no-cache upgrade && \ + apk --no-cache add proftpd proftpd-mod_tls proftpd-mod_ifsession \ proftpd-mod_deflate proftpd-mod_geoip proftpd-mod_sql_sqlite \ proftpd-utils openssl perl acme.sh lftp sqlite && \ mkdir -p /var/run/proftpd /etc/proftpd/custom.conf.d/ diff --git a/manifest.tmpl b/manifest.tmpl index f62934e..afc5524 100644 --- a/manifest.tmpl +++ b/manifest.tmpl @@ -1,4 +1,4 @@ -image: docker.asperti.com/paspo/ftps:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: docker.asperti.com/paspo/ftps:latest {{#if build.tags}} tags: {{#each build.tags}} @@ -7,12 +7,12 @@ tags: {{/if}} manifests: - - image: docker.asperti.com/paspo/ftps:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + image: docker.asperti.com/paspo/ftps:latest-linux-amd64 platform: architecture: amd64 os: linux - - image: docker.asperti.com/paspo/ftps:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + image: docker.asperti.com/paspo/ftps:latest-linux-arm64 platform: variant: v8 architecture: arm64