From 5bcd41057ade4c1c9347889647b9983e53445944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 25 Apr 2022 23:13:34 +0200 Subject: [PATCH] update docker images & ci (#276) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update images Signed-off-by: André Bauer * remove unneeded dummey dockerfile Signed-off-by: André Bauer * fix superlinter Signed-off-by: André Bauer * fix stale.yml Signed-off-by: André Bauer * update version Signed-off-by: André Bauer * remove codespell Signed-off-by: André Bauer * add fetcfh depth Signed-off-by: André Bauer * fix codepsell removal Signed-off-by: André Bauer * enable VALIDATE_ALL_CODEBASE Signed-off-by: André Bauer --- .env | 2 +- .../proxy/docker-compose.proxy-example.yml | 5 ++-- .examples/proxy/docker-compose.yml | 4 ++- .github/linters/.markdown-lint.yml | 3 +- .github/stale.yml | 1 + .github/workflows/ci-remote-image.yaml | 3 +- .github/workflows/ci.yaml | 29 ++++++------------- Dockerfile | 12 -------- containers/zammad-elasticsearch/Dockerfile | 2 +- containers/zammad-postgresql/Dockerfile | 2 +- docker-compose.override-local.yml | 1 + docker-compose.override.yml | 2 ++ docker-compose.yml | 1 + rancher-compose.yml | 1 + 14 files changed, 28 insertions(+), 40 deletions(-) delete mode 100644 Dockerfile diff --git a/.env b/.env index 350d7b6..5d0ed48 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ POSTGRES_USER=zammad REDIS_URL=redis://zammad-redis:6379 RESTART=always # don't forget to add the minus before the version -VERSION=-5.1.0-4 +VERSION=-5.1.1-10 diff --git a/.examples/proxy/docker-compose.proxy-example.yml b/.examples/proxy/docker-compose.proxy-example.yml index 31f2747..bdc0c80 100644 --- a/.examples/proxy/docker-compose.proxy-example.yml +++ b/.examples/proxy/docker-compose.proxy-example.yml @@ -1,6 +1,7 @@ -version: '2' -services: +--- +version: "2" +services: zammad-nginx: environment: - VIRTUAL_HOST=helpdesk.domain.tld diff --git a/.examples/proxy/docker-compose.yml b/.examples/proxy/docker-compose.yml index fad2dea..e2b2e1c 100644 --- a/.examples/proxy/docker-compose.yml +++ b/.examples/proxy/docker-compose.yml @@ -1,4 +1,6 @@ +--- version: '2' + services: frontend: image: jwilder/nginx-proxy:alpine @@ -10,7 +12,7 @@ services: - ./certs:/etc/nginx/certs - /var/run/docker.sock:/tmp/docker.sock:ro networks: - - 2_apps + - 2_apps networks: 2_apps: diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml index 5d7892a..a3777d6 100644 --- a/.github/linters/.markdown-lint.yml +++ b/.github/linters/.markdown-lint.yml @@ -1,2 +1,3 @@ +--- MD013: - line_length: 500 + line_length: 600 diff --git a/.github/stale.yml b/.github/stale.yml index dc90e5a..82c0d00 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,3 +1,4 @@ +--- # Number of days of inactivity before an issue becomes stale daysUntilStale: 60 # Number of days of inactivity before a stale issue is closed diff --git a/.github/workflows/ci-remote-image.yaml b/.github/workflows/ci-remote-image.yaml index 9ed0dc4..327c995 100644 --- a/.github/workflows/ci-remote-image.yaml +++ b/.github/workflows/ci-remote-image.yaml @@ -1,3 +1,4 @@ +--- name: ci-remote-image on: @@ -11,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: pull docker-compose images run: docker-compose pull diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9c019de..7dd6458 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,28 +1,15 @@ +--- name: ci on: pull_request: jobs: - codespell: - name: codespell - runs-on: ubuntu-20.04 - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - - name: Codespell - uses: codespell-project/actions-codespell@master - with: - skip: .git - check_filenames: true - check_hidden: true - lint-docker-compose-file: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: lint zammad docker-compose file run: docker-compose config @@ -31,26 +18,28 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Lint Code Base - uses: github/super-linter@v4 + uses: github/super-linter/slim@v4 env: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + LINTER_RULES_PATH: .github/linters + VALIDATE_ALL_CODEBASE: false VALIDATE_JSCPD: false - build-and-run-docker-compose: needs: - - codespell - lint-docker-compose-file - super-linter timeout-minutes: 20 runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: build docker containers run: .github/docker-image-build.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ebdff68..0000000 --- a/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG BUILD_DATE - -LABEL org.label-schema.build-date="$BUILD_DATE" \ - org.label-schema.name="Zammad" \ - org.label-schema.license="AGPL-3.0" \ - org.label-schema.description="Docker container for Zammad - Dummy Dockerfile for DockerHub autobuilds" \ - org.label-schema.url="https://zammad.org" \ - 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="5.1.0" \ - org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index 915afb4..98a8c24 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.3 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.3 ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile index 7bb618c..25b247f 100644 --- a/containers/zammad-postgresql/Dockerfile +++ b/containers/zammad-postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:9.6.20-alpine +FROM postgres:9.6.24-alpine ARG BUILD_DATE diff --git a/docker-compose.override-local.yml b/docker-compose.override-local.yml index 14baddf..f10bab4 100644 --- a/docker-compose.override-local.yml +++ b/docker-compose.override-local.yml @@ -1,3 +1,4 @@ +--- version: '3' services: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f7888bb..3c1e74f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,6 @@ +--- version: '3' + services: zammad-nginx: diff --git a/docker-compose.yml b/docker-compose.yml index 621c6f9..1bb3692 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: '3' services: diff --git a/rancher-compose.yml b/rancher-compose.yml index bc49675..26e6fb3 100644 --- a/rancher-compose.yml +++ b/rancher-compose.yml @@ -1,3 +1,4 @@ +--- version: '2' services: