update docker images & ci (#276)

* update images

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* remove unneeded dummey dockerfile

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix superlinter

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix stale.yml

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* update version

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* remove codespell

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* add fetcfh depth

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix codepsell removal

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* enable VALIDATE_ALL_CODEBASE

Signed-off-by: André Bauer <andre.bauer@staffbase.com>
This commit is contained in:
André Bauer 2022-04-25 23:13:34 +02:00 committed by GitHub
parent c6be2e5326
commit 5bcd41057a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 28 additions and 40 deletions

2
.env
View File

@ -5,4 +5,4 @@ POSTGRES_USER=zammad
REDIS_URL=redis://zammad-redis:6379 REDIS_URL=redis://zammad-redis:6379
RESTART=always RESTART=always
# don't forget to add the minus before the version # don't forget to add the minus before the version
VERSION=-5.1.0-4 VERSION=-5.1.1-10

View File

@ -1,6 +1,7 @@
version: '2' ---
services: version: "2"
services:
zammad-nginx: zammad-nginx:
environment: environment:
- VIRTUAL_HOST=helpdesk.domain.tld - VIRTUAL_HOST=helpdesk.domain.tld

View File

@ -1,4 +1,6 @@
---
version: '2' version: '2'
services: services:
frontend: frontend:
image: jwilder/nginx-proxy:alpine image: jwilder/nginx-proxy:alpine

View File

@ -1,2 +1,3 @@
---
MD013: MD013:
line_length: 500 line_length: 600

1
.github/stale.yml vendored
View File

@ -1,3 +1,4 @@
---
# Number of days of inactivity before an issue becomes stale # Number of days of inactivity before an issue becomes stale
daysUntilStale: 60 daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed # Number of days of inactivity before a stale issue is closed

View File

@ -1,3 +1,4 @@
---
name: ci-remote-image name: ci-remote-image
on: on:
@ -11,7 +12,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: pull docker-compose images - name: pull docker-compose images
run: docker-compose pull run: docker-compose pull

View File

@ -1,28 +1,15 @@
---
name: ci name: ci
on: on:
pull_request: pull_request:
jobs: 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: lint-docker-compose-file:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: lint zammad docker-compose file - name: lint zammad docker-compose file
run: docker-compose config run: docker-compose config
@ -31,26 +18,28 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v2 uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Lint Code Base - name: Lint Code Base
uses: github/super-linter@v4 uses: github/super-linter/slim@v4
env: env:
DEFAULT_BRANCH: master DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LINTER_RULES_PATH: .github/linters
VALIDATE_ALL_CODEBASE: false
VALIDATE_JSCPD: false VALIDATE_JSCPD: false
build-and-run-docker-compose: build-and-run-docker-compose:
needs: needs:
- codespell
- lint-docker-compose-file - lint-docker-compose-file
- super-linter - super-linter
timeout-minutes: 20 timeout-minutes: 20
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: build docker containers - name: build docker containers
run: .github/docker-image-build.sh run: .github/docker-image-build.sh

View File

@ -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"

View File

@ -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 ARG BUILD_DATE
LABEL org.label-schema.build-date="$BUILD_DATE" \ LABEL org.label-schema.build-date="$BUILD_DATE" \

View File

@ -1,4 +1,4 @@
FROM postgres:9.6.20-alpine FROM postgres:9.6.24-alpine
ARG BUILD_DATE ARG BUILD_DATE

View File

@ -1,3 +1,4 @@
---
version: '3' version: '3'
services: services:

View File

@ -1,4 +1,6 @@
---
version: '3' version: '3'
services: services:
zammad-nginx: zammad-nginx:

View File

@ -1,3 +1,4 @@
---
version: '3' version: '3'
services: services:

View File

@ -1,3 +1,4 @@
---
version: '2' version: '2'
services: services: