fix: rollback to v3.2.4

2021-09-01 21:07:07 +02:00
7 changed files with 113 additions and 690 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -5,12 +5,13 @@ name: linter

 platform:
  os: linux
+  arch: amd64

 steps:
 - name: markdown lint
  commands:
  - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.30.0
+  image: docker.io/tmknom/markdownlint:0.23.1
  resources:
    limits:
      cpu: 50
@ -40,11 +41,10 @@ trigger:
  event:
    exclude:
    - tag
-
 ---
 kind: pipeline
 type: docker
-name: dry-run-amd64
+name: build-latest

 platform:
  os: linux
@ -52,21 +52,42 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    dry_run: true
-    tags: latest-amd64
-    repo: volkerraschek/markdownlint
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/build
  volumes:
  - name: docker_socket
    path: /var/run/docker.sock
+  when:
+    branch:
+    - master
+
+- name: push
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/push
+  environment:
+    POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD:
+      from_secret: container_image_registry_password
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    branch:
+    - master
+    repo:
+    - volker.raschek/postfixadmin-docker
+
+- name: delete
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/delete
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    branch:
+    - master

 - name: notify
  image: drillster/drone-email
@ -89,145 +110,15 @@ volumes:
  host:
    path: /var/run/docker.sock

-depends_on:
- linter
-
 trigger:
-  branch:
-    exclude:
-    - master
  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
+    exclude:
+    - tag

 ---
 kind: pipeline
 type: docker
-name: dry-run-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    dry_run: true
-    tags: latest-arm-v7
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-depends_on:
- linter
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: dry-run-arm64-v8
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    dry_run: true
-    tags: latest-arm64-v8
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-depends_on:
- linter
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: latest-amd64
+name: build-tagged

 platform:
  os: linux
@ -235,247 +126,28 @@ platform:

 steps:
 - name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-amd64
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/build POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
  volumes:
  - name: docker_socket
    path: /var/run/docker.sock

- name: notify
-  image: drillster/drone-email
+- name: push
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/push POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-depends_on:
- linter
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: latest-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-arm-v7
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
+    POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD:
      from_secret: container_image_registry_password
-    no_cache: true
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
  volumes:
  - name: docker_socket
    path: /var/run/docker.sock
-  when:
-    status:
-    - changed
-    - failure

-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-depends_on:
- linter
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: latest-arm64-v8
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-arm64-v8
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-depends_on:
- linter
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: kubernetes
-name: latest-manifest
-
-steps:
- name: build-manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: false
-    ignore_missing: true
-    spec: manifest.tmpl
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-
- name: notify
-  image: docker.io/drillster/drone-email:latest
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
- latest-amd64
- latest-arm-v7
- latest-arm64-v8
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: tagged-amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: true
-    auto_tag_suffix: amd64
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    build_args:
-    - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
+- name: delete
+  image: docker.io/volkerraschek/build-image:latest
+  commands:
+  - make container-image/delete POSTFIXADMIN_IMAGE_VERSION=${DRONE_TAG}
  volumes:
  - name: docker_socket
    path: /var/run/docker.sock
@ -506,165 +178,6 @@ trigger:
  - tag
  repo:
  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: tagged-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: true
-    auto_tag_suffix: arm-v7
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    build_args:
-    - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: docker
-name: tagged-arm64-v8
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: true
-    auto_tag_suffix: arm64-v8
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    build_args:
-    - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-
- name: notify
-  image: drillster/drone-email
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  when:
-    status:
-    - changed
-    - failure
-
-volumes:
- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/postfixadmin-docker
-
---
-kind: pipeline
-type: kubernetes
-name: tagged-manifest
-
-steps:
- name: build-manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    spec: manifest.tmpl
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-
- name: notify
-  image: docker.io/drillster/drone-email:latest
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
- tagged-amd64
- tagged-arm-v7
- tagged-arm64-v8
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/postfixadmin-docker
-
 ---
 kind: pipeline
 type: kubernetes
@ -708,14 +221,8 @@ steps:
    - changed
    - failure

-depends_on:
- latest-manifest
-
 trigger:
-  branch:
-  - master
  event:
-  - cron
  - push
  repo:
  - volker.raschek/postfixadmin-docker
--- a/21
+++ b/21
@ -1,7 +1,8 @@
 FROM docker.io/library/php:7.4-apache

 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION=3.3.9
+ARG POSTFIXADMIN_VERSION \
+    POSTFIXADMIN_SHA512

 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
@ -23,7 +24,7 @@ ENV POSTFIXADMIN_DATABASE_TYPE=sqlite \
 # docker-entrypoint.sh dependencies
 RUN set -eux; \
  apt-get update; \
-  apt-get install --yes --no-install-recommends gosu apache2-utils; \
+  apt-get install --yes --no-install-recommends gosu; \
  rm --recursive --force /var/lib/apt/lists/*

 # Install required PHP extensions
@ -51,18 +52,16 @@ RUN set -ex; \
    | cut -d: -f1 \
    | sort -u \
    | xargs -rt apt-mark manual; \
-    if [ ! -z ${POSTFIXADMIN_VERSION} ]; then \
-      curl --fail --silent --show-error --location "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz" --output postfixadmin.tar.gz; \
-      tar --extract --file postfixadmin.tar.gz --directory /var/www/html --strip-components=1; \
-      rm postfixadmin.tar.gz; \
-    else \
-      apt-get install --yes git; \
-      git clone https://github.com/postfixadmin/postfixadmin.git /var/www/html; \
-    fi; \
  apt-get purge --yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
  rm --recursive --force /var/lib/apt/lists/*

-RUN mkdir --parents /var/www/html/templates_c; \
+RUN set -eu; \
+  curl --fail --silent --show-error --location "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz" --output postfixadmin.tar.gz ; \
+  echo "${POSTFIXADMIN_SHA512} *postfixadmin.tar.gz" | sha512sum -c -; \
+  tar --extract --file postfixadmin.tar.gz --directory /var/www/html --strip-components=1; \
+  rm postfixadmin.tar.gz; \
+  # Does not exist in tarball but is required
+  mkdir --parents /var/www/html/templates_c; \
  chown --recursive www-data:www-data /var/www/html

 COPY entrypoint.sh /usr/local/bin/
--- a/4
+++ b/4
@ -1,3 +1,6 @@
+POSTFIXADMIN_VERSION:=3.2.4
+POSTFIXADMIN_SHA512:=2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47
+
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
 # container runtime. This is needed to start and run a container image.
@ -20,6 +23,7 @@ PHONY:=container-image/build
 container-image/build:
 	${CONTAINER_RUNTIME} build \
 		--build-arg POSTFIXADMIN_VERSION=${POSTFIXADMIN_VERSION} \
+		--build-arg POSTFIXADMIN_SHA512=${POSTFIXADMIN_SHA512} \
 		--file Dockerfile \
 		--no-cache \
 		--pull \
--- a/README.md
+++ b/README.md
@ -24,7 +24,7 @@ prefix `POSTFIXADMIN_`. You can take an example
 from the upstream project.

 | name                                | default                     |
-| ----------------------------------- | ------------------------------------------- |
+| ----------------------------------- | --------------------------- |
 | `POSTFIXADMIN_ADMIN_EMAIL`          |                             |
 | `POSTFIXADMIN_ADMIN_SMTP_PASSWORD`  |                             |
 | `POSTFIXADMIN_ADMIN_NAME`           |                             |
@ -43,11 +43,6 @@ from the upstream project.
 | `POSTFIXADMIN_ENCRYPT`              | `md5crypt`                  |
 | `POSTFIXADMIN_SMTP_SERVER`          | `localhost`                 |
 | `POSTFIXADMIN_SMTP_PORT`            | `25`                        |
-| `POSTFIXADMIN_SMTP_CLIENT`          |                                             |
-| `POSTFIXADMIN_SHOW_FOOTER_TEXT`     | `YES`                                       |
-| `POSTFIXADMIN_FOOTER_TEXT`          | `Return to change-this-to-your.domain.tld`  |
-| `POSTFIXADMIN_FOOTER_LINK`          | `http://change-this-to-your.domain.tld`     |
-| `POSTFIXADMIN_FETCHMAIL`            | `YES`                                       |

 ### POSTFIXADMIN_ADMIN_EMAIL

@ -178,35 +173,5 @@ are documented
 ### POSTFIXADMIN_SETUP_PASSWORD

 To login into the `setup.php` page is the setup password required. This can be
-defined via the variable `POSTFIXADMIN_SETUP_PASSWORD`. The password will be
-hashed via bcrypt and used as value for the setting `$CONF['setup_password']` in
-the config file `config.local.php`.
-
-### POSTFIXADMIN_SMTP_CLIENT
-
-Hostname (FQDN) of the server hosting PostfixAdmin used in the `HELO` when
-sending emails from PostfixAdmin. The value of the environment will be
-configured as the following config setting and is empty by default:
-`$CONF['smtp_client']`.
-
-### POSTFIXADMIN_SMTP_SERVER
-
-Hostname (FQDN) of your mail server. The default value is `localhost`. The value
-of the environment will be configured as the following config setting:
-`$CONF['smtp_server']`.
-
-### POSTFIXADMIN_SMTP_PORT
-
-Port of your mail server. The default value is `25`. The value of the
-environment will be configured as the following config setting:
-`$CONF['smtp_port']`.
-
-### POSTFIXADMIN_SHOW_FOOTER_TEXT
-
-Enable or disable via `YES` or `NO` the footer text displayed on all sites. Use
-`POSTFIXADMIN_FOOTER_TEXT` and `POSTFIX_FOOTER_LINK` to customize the text.
-
-### POSTFIXADMIN_FETCHMAIL
-
-Enable or disable via `YES` or `NO` the fetchmail tab. It has nothing todo with
-the fetchmail cron job.
+defined via the variable `POSTFIXADMIN_SETUP_PASSWORD`. The password will not be
+configured in the `config.local.php` as plain text. It will be encrypted.
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -40,10 +40,6 @@ if [ "${POSTFIXADMIN_DATABASE_TYPE}" = 'sqlite' ]; then
  fi
 fi

-# bycrypt POSTFIXADMIN_SETUP_PASSWORD
-if [ ! -z ${POSTFIXADMIN_SETUP_PASSWORD+x} ]; then
-  POSTFIXADMIN_SETUP_PASSWORD=$(htpasswd -bnBC 10 "" "${POSTFIXADMIN_SETUP_PASSWORD}" | tr -d ':\n')
-fi

 # create config.local.pgp with vaules from env with POSTFIXADMIN_ prefix
 POSTFIXADMIN_ENV_VARS=($(env | sort | grep --perl-regexp '^POSTFIXADMIN_.*'))
--- a/manifest.tmpl
+++ b/manifest.tmpl
@ -1,26 +0,0 @@
-image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-  - "latest"
-{{/if}}
-manifests:
-  -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-armv7
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
--- a/renovate.json
+++ b/renovate.json
@ -1,22 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automerge": false,
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch",
-  "regexManagers": [
-    {
-      "description": "Update postfixadmin git tag",
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "ARG POSTFIXADMIN_VERSION=(?<currentValue>.*?)\n"
-      ],
-      "depNameTemplate": "postfixadmin/postfixadmin",
-      "datasourceTemplate": "github-tags",
-      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s"
-    }
-  ]
-}