From 2876dcc893af456b22bf3bba6e3f5ac25f518ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 27 Feb 2020 10:23:28 +0100 Subject: [PATCH 1/7] removed blankline (#137) --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1d165dc..2cd6f09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,6 @@ services: - zammad-backup:/var/tmp/zammad - zammad-data:/opt/zammad - zammad-elasticsearch: environment: - discovery.type=single-node From cb046658ff879975f54405cf52b94182ff1a7e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 27 Feb 2020 12:39:59 +0100 Subject: [PATCH 2/7] set ci timeout to 10 min --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2e7ae51..fecb75c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,7 +34,7 @@ jobs: dockerfile: containers/zammad/Dockerfile test-docker-compose: - timeout-minutes: 30 + timeout-minutes: 10 runs-on: ubuntu-latest needs: lint-docker-files steps: @@ -47,4 +47,4 @@ jobs: - name: run tests run: .github/tests.sh - \ No newline at end of file + From 0b787b2da01e574bfc61c770d5a1a6d48de478a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 27 Feb 2020 12:42:06 +0100 Subject: [PATCH 3/7] raised sleep to 30 seconds to get some more logs --- .github/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/tests.sh b/.github/tests.sh index 5a2dbd3..728e5bb 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -13,7 +13,7 @@ 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 :)" From 20b99bcaa11efb65ad9653308389bef672a4acd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Thu, 27 Feb 2020 12:42:50 +0100 Subject: [PATCH 4/7] removed deletion of tmp file --- .github/lint-scripts.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/lint-scripts.sh b/.github/lint-scripts.sh index 7bf2204..954a6ae 100755 --- a/.github/lint-scripts.sh +++ b/.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}" From 028f6f4f5d672bf39913b7af8c8a5525e20a1340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 28 Feb 2020 00:38:52 +0100 Subject: [PATCH 5/7] added autowizard as test (#139) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added autowizard as test Signed-off-by: André Bauer * fix filename Signed-off-by: André Bauer * removed workflow needs Signed-off-by: André Bauer * added another sleep to see some more logs Signed-off-by: André Bauer * remove sleep Signed-off-by: André Bauer --- .github/auto_wizard.json | 31 +++++++++++++++++++++++++++++++ .github/tests.sh | 9 +++++++++ .github/workflows/ci.yaml | 6 ++---- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 .github/auto_wizard.json diff --git a/.github/auto_wizard.json b/.github/auto_wizard.json new file mode 100644 index 0000000..90852bb --- /dev/null +++ b/.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" + } + ] +} \ No newline at end of file diff --git a/.github/tests.sh b/.github/tests.sh index 728e5bb..e3d44fd 100755 --- a/.github/tests.sh +++ b/.github/tests.sh @@ -18,3 +18,12 @@ 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 + diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fecb75c..6c4ec94 100644 --- a/.github/workflows/ci.yaml +++ b/.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 @@ -36,7 +35,6 @@ jobs: test-docker-compose: 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 - - From 589efbc3a692189385995687c95582849a472d11 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Thu, 5 Mar 2020 14:36:07 +0100 Subject: [PATCH 6/7] Building of Elasticsearch broken: Installation of ingest-attachment fails with error code 141. ``` @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @ WARNING: plugin requires additional permissions @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ * java.lang.RuntimePermission accessClassInPackage.sun.java2d.cmm.kcms * java.lang.RuntimePermission accessDeclaredMembers * java.lang.RuntimePermission getClassLoader * java.lang.reflect.ReflectPermission suppressAccessChecks * java.security.SecurityPermission createAccessControlContext * java.security.SecurityPermission insertProvider * java.security.SecurityPermission putProviderProperty.BC See http://docs.oracle.com/javase/8/docs/technotes/guides/security/permissions.html for descriptions of what these permissions allow and the associated risks. -> Installed ingest-attachment The command '/bin/bash -e -o pipefail -c yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment' returned a non-zero code: 141 ``` --- containers/zammad-elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index 99f5e06..4c105d2 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -14,4 +14,4 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ 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 From 1d1daab5826fe048d5cf2429a801c3701a55f948 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Thu, 5 Mar 2020 15:15:02 +0100 Subject: [PATCH 7/7] Required changes for 3.3 release. --- .env | 2 +- 3.3.diff | 73 ++++++++++++++++++++++ Dockerfile | 2 +- README.md | 2 +- containers/zammad-elasticsearch/Dockerfile | 2 +- containers/zammad-postgresql/Dockerfile | 2 +- containers/zammad/Dockerfile | 2 +- 7 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 3.3.diff 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/3.3.diff b/3.3.diff new file mode 100644 index 0000000..55e6756 --- /dev/null +++ b/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 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