testing lint
Signed-off-by: André Bauer <monotek23@gmail.com>
This commit is contained in:
parent
6f0c289826
commit
873e9a794e
@ -10,6 +10,3 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
|||||||
org.label-schema.vendor="Zammad" \
|
org.label-schema.vendor="Zammad" \
|
||||||
org.label-schema.schema-version="3.6.0" \
|
org.label-schema.schema-version="3.6.0" \
|
||||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||||
|
|
||||||
|
|
||||||
testlint
|
|
20
README.md
20
README.md
@ -6,16 +6,13 @@ twitter, chat and e-mails. It is distributed under the GNU AFFERO General Public
|
|||||||
License (AGPL). Do you receive many e-mails and want to answer them with a team of agents?
|
License (AGPL). Do you receive many e-mails and want to answer them with a team of agents?
|
||||||
You're going to love Zammad!
|
You're going to love Zammad!
|
||||||
|
|
||||||
|
|
||||||
## What is zammad-docker-compose repo for?
|
## What is zammad-docker-compose repo for?
|
||||||
|
|
||||||
This repo is meant to be the starting point for somebody who likes to use dockerized multi-container Zammad in production.
|
This repo is meant to be the starting point for somebody who likes to use dockerized multi-container Zammad in production.
|
||||||
|
|
||||||
|
|
||||||
## Getting started with zammad-docker-compose
|
## Getting started with zammad-docker-compose
|
||||||
|
|
||||||
https://docs.zammad.org/en/latest/install-docker-compose.html
|
<https://docs.zammad.org/en/latest/install-docker-compose.html>
|
||||||
|
|
||||||
|
|
||||||
## CI Status
|
## CI Status
|
||||||
|
|
||||||
@ -26,19 +23,20 @@ https://docs.zammad.org/en/latest/install-docker-compose.html
|
|||||||
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.
|
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 revers 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`
|
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`
|
`cp ./.examples/proxy/docker-compose.proxy-example.yml ./docker-compose.prod.yml`
|
||||||
1. Modify the environment variable `VIRTUAL_HOST` and the name of the external network in `./docker-compose.prod.yml` to fit your environment.
|
2. Modify the environment variable `VIRTUAL_HOST` and the name of the external network in `./docker-compose.prod.yml` to fit your environment.
|
||||||
1. Run docker-composer commands with the default and your configuration, e.g. `docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d`
|
3. Run docker-composer commands with the default and your configuration, e.g. `docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d`
|
||||||
|
|
||||||
See `.examples/proxy/docker-compose.yml` for an example proxy project.
|
See `.examples/proxy/docker-compose.yml` for an example proxy project.
|
||||||
|
|
||||||
Like this, you can add your `docker-compose.prod.yml` to a branch of your Git repository and stay up to date by merging changes to your branch.
|
Like this, you can add your `docker-compose.prod.yml` to a branch of your Git repository and stay up to date by merging changes to your branch.
|
||||||
|
|
||||||
|
|
||||||
## Using Rancher
|
## Using Rancher
|
||||||
|
|
||||||
* RANCHER_URL=http://RANCHER_HOST:8080 rancher-compose --env-file=.env up
|
```console
|
||||||
|
RANCHER_URL=http://RANCHER_HOST:8080 rancher-compose --env-file=.env up
|
||||||
|
```
|
||||||
|
|
||||||
## Running without Elasticsearch
|
## Running without Elasticsearch
|
||||||
|
|
||||||
@ -54,7 +52,7 @@ 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.
|
As there is no direct upgrade path we have to delete all Elasticsearch indices and rebuild them.
|
||||||
Do the following to empty the ES docker volume:
|
Do the following to empty the ES docker volume:
|
||||||
|
|
||||||
```
|
```console
|
||||||
docker-compose stop
|
docker-compose stop
|
||||||
set -o pipefail DOCKER_VOLUME="$(docker volume inspect zammaddockercompose_elasticsearch-data | grep Mountpoint | sed -e 's#.*": "##g' -e 's#",##')/*"
|
set -o pipefail DOCKER_VOLUME="$(docker volume inspect zammaddockercompose_elasticsearch-data | grep Mountpoint | sed -e 's#.*": "##g' -e 's#",##')/*"
|
||||||
echo "${DOCKER_VOLUME}" #check this is a valid docker volume path! if not do not proceed or you might lose data!
|
echo "${DOCKER_VOLUME}" #check this is a valid docker volume path! if not do not proceed or you might lose data!
|
||||||
@ -64,7 +62,7 @@ docker-compose start
|
|||||||
|
|
||||||
To workaround the [changes in the PostgreSQL 9.6 container](https://github.com/docker-library/postgres/commit/f1bc8782e7e57cc403d0b32c0e24599535859f76) do the following:
|
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-compose start
|
||||||
docker exec -it zammaddockercompose_zammad-postgresql_1 bash
|
docker exec -it zammaddockercompose_zammad-postgresql_1 bash
|
||||||
psql --username postgres --dbname zammad_production
|
psql --username postgres --dbname zammad_production
|
||||||
|
@ -15,5 +15,3 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
|||||||
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
|
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
|
||||||
|
|
||||||
testlint
|
|
@ -34,7 +34,7 @@ services:
|
|||||||
- zammad-postgresql
|
- zammad-postgresql
|
||||||
environment:
|
environment:
|
||||||
- POSTGRESQL_USER=${POSTGRES_USER}
|
- POSTGRESQL_USER=${POSTGRES_USER}
|
||||||
- POSTGRESQL_PASS=${POSTGRES_PASS}
|
- POSTGRESQL_PASS=${POSTGRES_PASS}
|
||||||
image: ${IMAGE_REPO}:zammad${VERSION}
|
image: ${IMAGE_REPO}:zammad${VERSION}
|
||||||
links:
|
links:
|
||||||
- zammad-elasticsearch
|
- zammad-elasticsearch
|
||||||
|
Loading…
Reference in New Issue
Block a user