Merge remote-tracking branch 'upstream/master'

.env

@@ -3,4 +3,4 @@ IMAGE_REPO=zammad/zammad-docker-compose
 POSTGRES_PASS=zammad
 POSTGRES_USER=zammad
 RESTART=always
-VERSION=-3.2.0-13
+VERSION=-3.3.0-6

.github/auto_wizard.json

@@ -0,0 +1,31 @@
+{
+    "Token": "docker_compose_token",
+    "TextModuleLocale": {
+        "Locale": "en-us"
+    },
+    "Users": [
+        {
+        "login": "info@zammad.org",
+        "firstname": "Zam",
+        "lastname": "Mad",
+        "email": "info@zammad.org",
+        "organization": "Zammad",
+        "password": "Zammad"
+        }
+    ],
+    "Settings": [
+        {
+        "name": "product_name",
+        "value": "Zammad Service Desk"
+        },
+        {
+        "name": "system_online_service",
+        "value": true
+        }
+    ],
+    "Organizations": [
+        {
+        "name": "Zammad"
+        }
+    ]
+}

.github/lint-scripts.sh

@@ -13,5 +13,3 @@ while read -r FILE; do
   echo lint "${FILE}"
   shellcheck -x "${FILE}"
 done < "${TMP_FILE}"
-
-rm "${TMP_FILE}"

.github/tests.sh

@@ -13,8 +13,17 @@ until (curl -I --silent --fail localhost | grep -iq "HTTP/1.1 200 OK"); do
     sleep 15
 done
 
-sleep 10
+sleep 30
 
 echo
 echo "Success - Zammad is up :)"
 echo
+echo "Execute autowizard..."
+echo
+
+curl -I --silent --fail --show-error "http://localhost/#getting_started/auto_wizard/docker_compose_token" > /dev/null
+
+echo 
+echo "Autowizard executed successful"
+echo 
+

.github/workflows/ci.yaml

@@ -16,7 +16,6 @@ jobs:
 
   lint-docker-files:
     runs-on: ubuntu-latest
-    needs: lint-bash-scripts
     steps:
       - name: Checkout
         uses: actions/checkout@v1    
@@ -34,9 +33,8 @@ jobs:
           dockerfile: containers/zammad/Dockerfile                    
 
   test-docker-compose:
-    timeout-minutes: 30
+    timeout-minutes: 10
     runs-on: ubuntu-latest
-    needs: lint-docker-files
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -44,7 +42,7 @@ jobs:
         run: docker-compose pull
       - name: run docker-compose up
         run: docker-compose 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
-
-  

3.3.diff

@@ -0,0 +1,73 @@
+diff --git a/.env b/.env
+index 5cbee27..81670e9 100644
+--- a/.env
++++ b/.env
+@@ -3,4 +3,4 @@ IMAGE_REPO=zammad/zammad-docker-compose
+ POSTGRES_PASS=zammad
+ POSTGRES_USER=zammad
+ RESTART=always
+-VERSION=-3.2.0-13
++VERSION=-3.3.0-6
+diff --git a/Dockerfile b/Dockerfile
+index b5001d1..9e824ad 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
+       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
+       org.label-schema.vcs-type="Git" \
+       org.label-schema.vendor="Zammad" \
+-      org.label-schema.schema-version="3.2.0" \
++      org.label-schema.schema-version="3.3.0" \
+       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
+diff --git a/README.md b/README.md
+index 28eb778..8604c73 100644
+--- a/README.md
++++ b/README.md
+@@ -42,7 +42,7 @@ Like this, you can add your `docker-compose.prod.yml` to a branch of your Git re
+ 
+ ## Upgrading
+ 
+-### From =< 3.2.0-12
++### 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 indicies and rebuild them.
+diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile
+index 4c105d2..f20aceb 100644
+--- a/containers/zammad-elasticsearch/Dockerfile
++++ b/containers/zammad-elasticsearch/Dockerfile
+@@ -9,7 +9,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
+       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
+       org.label-schema.vcs-type="Git" \
+       org.label-schema.vendor="Zammad" \
+-      org.label-schema.schema-version="3.2.0" \
++      org.label-schema.schema-version="3.3.0" \
+       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
+ 
+ SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile
+index bacf81c..3904638 100644
+--- a/containers/zammad-postgresql/Dockerfile
++++ b/containers/zammad-postgresql/Dockerfile
+@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
+       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
+       org.label-schema.vcs-type="Git" \
+       org.label-schema.vendor="Zammad" \
+-      org.label-schema.schema-version="3.2.0" \
++      org.label-schema.schema-version="3.3.0" \
+       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
+ 
+ SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile
+index 8fb92f5..40ae4be 100644
+--- a/containers/zammad/Dockerfile
++++ b/containers/zammad/Dockerfile
+@@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
+       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
+       org.label-schema.vcs-type="Git" \
+       org.label-schema.vendor="Zammad" \
+-      org.label-schema.schema-version="3.2.0" \
++      org.label-schema.schema-version="3.3.0" \
+       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
+ 
+ ENV GIT_BRANCH stable

Dockerfile

@@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
       org.label-schema.vendor="Zammad" \
-      org.label-schema.schema-version="3.2.0" \
+      org.label-schema.schema-version="3.3.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"

README.md

@@ -42,7 +42,7 @@ Like this, you can add your `docker-compose.prod.yml` to a branch of your Git re
 
 ## Upgrading
 
-### From =< 3.2.0-12
+### 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 indicies and rebuild them.

containers/zammad-elasticsearch/Dockerfile

@@ -9,9 +9,9 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
       org.label-schema.vendor="Zammad" \
-      org.label-schema.schema-version="3.2.0" \
+      org.label-schema.schema-version="3.3.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
 
-RUN yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment

containers/zammad-postgresql/Dockerfile

@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
       org.label-schema.vendor="Zammad" \
-      org.label-schema.schema-version="3.2.0" \
+      org.label-schema.schema-version="3.3.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]

containers/zammad/Dockerfile

@@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
       org.label-schema.vendor="Zammad" \
-      org.label-schema.schema-version="3.2.0" \
+      org.label-schema.schema-version="3.3.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
 ENV GIT_BRANCH stable