Merge branch 'zammad:master' into master

.env

@@ -1,8 +1,8 @@
 IMAGE_REPO=zammad/zammad-docker-compose
 MEMCACHE_SERVERS=zammad-memcached:11211
+POSTGRES_VERSION=15.1-alpine
 POSTGRES_PASS=zammad
 POSTGRES_USER=zammad
 REDIS_URL=redis://zammad-redis:6379
 RESTART=always
-# don't forget to add the minus before the version
-VERSION=-5.2.1-7
+VERSION=5.3.1-6

.github/dependabot.yml

@@ -8,20 +8,6 @@ updates:
       time: "09:00"
       timezone: "Europe/Berlin"
 
-  - package-ecosystem: "docker"
-    directory: "/containers/zammad-elasticsearch"
-    schedule:
-      interval: "weekly"
-      time: "09:00"
-      timezone: "Europe/Berlin"
-
-  - package-ecosystem: "docker"
-    directory: "/containers/zammad-postgresql"
-    schedule:
-      interval: "weekly"
-      time: "09:00"
-      timezone: "Europe/Berlin"
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/release-drafter.yml

@@ -0,0 +1,37 @@
+name-template: "v$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
+categories:
+  - title: "🚀 Features"
+    labels:
+      - "feature"
+      - "enhancement"
+  - title: "🐛 Bug Fixes"
+    labels:
+      - "fix"
+      - "bugfix"
+      - "bug"
+  - title: "🧹 Maintenance"
+    labels:
+      - "chore"
+      - "dependencies"
+version-resolver:
+  major:
+    labels:
+      - "feature"
+  minor:
+    labels:
+      - "enhancement"
+  patch:
+    labels:
+      - "fix"
+      - "bugfix"
+      - "bug"
+      - "chore"
+      - "dependencies"
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES
+
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION

.github/workflows/ci-remote-image.yaml

@@ -3,13 +3,11 @@ name: ci-remote-image
 
 on:
   pull_request:
-    paths:
-      - '.env'
 
 jobs:
   run-remote-image-docker-compose:
     timeout-minutes: 20
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   lint-docker-compose-file:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -15,7 +15,7 @@ jobs:
         run: docker-compose config
 
   super-linter:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -30,25 +30,3 @@ jobs:
           LINTER_RULES_PATH: .github/linters
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_JSCPD: false
-
-  build-and-run-docker-compose:
-    needs:
-      - lint-docker-compose-file
-      - super-linter
-    timeout-minutes: 20
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: build docker containers
-        run: .github/docker-image-build.sh
-
-      - name: run docker-compose up
-        run: docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.override-local.yml up --detach
-
-      - name: add autowizard file
-        run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad
-
-      - name: run tests
-        run: .github/tests.sh

.github/workflows/release-drafter.yaml

@@ -0,0 +1,22 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -12,16 +12,22 @@ This repository is meant to be the starting point for somebody who likes to use
 
 ## Getting started with zammad-docker-compose
 
-[Learn more on Zammads documentation](https://docs.zammad.org/en/latest/install/docker-compose.html)
+[Learn more on Zammad’s documentation](https://docs.zammad.org/en/latest/install/docker-compose.html)
+
+## Upgrading
+
+For upgrading instructions see our [Releases](https://github.com/zammad/zammad-docker-compose/releases).
+
+Please be aware that the zammad-docker-compose repository versions and tags don't match the Zammad container tags!
 
 ## Status
 
-[![CI Status](https://github.com/zammad/zammad-docker-compose/workflows/ci/badge.svg)](https://github.com/zammad/zammad-docker-compose/actions) [![Docker Pulls](https://badgen.net/docker/pulls/zammad/zammad-docker-compose?icon=docker&label=pulls)](https://hub.docker.com/r/zammad/zammad-docker-compose/)
+[![ci-remote-image](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml/badge.svg)](https://github.com/zammad/zammad-docker-compose/actions/workflows/ci-remote-image.yaml) [![Docker Pulls](https://badgen.net/docker/pulls/zammad/zammad-docker-compose?icon=docker&label=pulls)](https://hub.docker.com/r/zammad/zammad-docker-compose/)
 
 ## Using a reverse proxy
 
 In environments with more then one web applications it is necessary to use a reverse proxy to route connections to port 80 and 443 to the right application.
-To run Zammad behind a revers proxy, we provide `docker-compose.proxy-example.yml` as a starting point.
+To run Zammad behind a reverse proxy, we provide `docker-compose.proxy-example.yml` as a starting point.
 
 1. Copy `./.examples/proxy/docker-compose.proxy-example.yml` to your own configuration, e.g. `./docker-compose.prod.yml`
     `cp ./.examples/proxy/docker-compose.proxy-example.yml ./docker-compose.prod.yml`
@@ -43,40 +49,3 @@ RANCHER_URL=http://RANCHER_HOST:8080 rancher-compose --env-file=.env up
 Elasticsearch is an optional, but strongly recommended dependency for Zammad. More details can be found in the [documentation](https://docs.zammad.org/en/latest/prerequisites/software.html#elasticsearch-optional). There are however certain scenarios when running without Elasticsearch may be desired, e.g. for very small teams, for teams with limited budget or as a temporary solution for an unplanned Elasticsearch downtime or planned cluster upgrade.
 
 Elasticsearch is enabled by default in the example `docker-compose.yml` file. It is also by default required to run the "zammad-init" command. Disabling Elasticsearch is possible by setting a special environment variable: `ELASTICSEARCH_ENABLED=false` for the `zammad-init` container and removing all references to Elasticsearch everywhere else: the `zammad-elasticsearch` container, it's volume and links to it.
-
-## Upgrading
-
-### From =< 3.3.0-12
-
-We've updated the Elasticsearch image from 5.6 to 7.6.
-As there is no direct upgrade path we have to delete all Elasticsearch indices and rebuild them.
-This will depend on the name of your docker container and volume, which depends on the checkout directory (`zammad-docker-compose` by default):
-
-```console
-docker-compose stop
-docker container rm zammad-docker-compose_zammad-elasticsearch_1
-docker volume rm zammad-docker-compose_elasticsearch-data
-docker-compose up --no-recreate
-```
-
-To workaround the [changes in the PostgreSQL 9.6 container](https://github.com/docker-library/postgres/commit/f1bc8782e7e57cc403d0b32c0e24599535859f76) do the following:
-
-```console
-docker-compose start
-docker exec -it zammaddockercompose_zammad-postgresql_1 bash
-psql --username postgres --dbname zammad_production
-CREATE USER zammad;
-ALTER USER zammad WITH PASSWORD 'zammad';
-ALTER USER zammad WITH SUPERUSER CREATEDB;
-```
-
-### From =< 3.6.0-65
-
-To be able to run Zammad container with an unprivileged user we had to change the port Nginx uses from 80 to 8080, so Zammad needs to be accessed via <http://localhost:8080> instead of <http://localhost> now!
-
-This change will also affect you, if you use a reverse proxy, like Traefik or Haproxy, in front of Zammad as your reverse proxy configuration needs to be adapted to point to port 8080 now.
-
-### From =< 4.0.0 to 5.0.0
-
-Memchached config changed. If you use the old env vars `MEMCACHED_HOST` & `MEMCACHED_PORT` adapt to `MEMCACHE_SERVERS`.
-Redis is a dependency for the Websocket server now.