Merge branch 'master' into develop/changes-for-zammad-5.1
This commit is contained in:
		
						commit
						0b1d50f532
					
				
							
								
								
									
										2
									
								
								.env
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								.env
									
									
									
									
									
								
							| @ -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.0.3-7 | VERSION=-5.0.3-14 | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							| @ -34,7 +34,7 @@ jobs: | |||||||
|         uses: actions/checkout@v2 |         uses: actions/checkout@v2 | ||||||
| 
 | 
 | ||||||
|       - name: Lint Code Base |       - name: Lint Code Base | ||||||
|         uses: github/super-linter@v3 |         uses: github/super-linter@v4 | ||||||
|         env: |         env: | ||||||
|           DEFAULT_BRANCH: master |           DEFAULT_BRANCH: master | ||||||
|           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||||
|  | |||||||
							
								
								
									
										10
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								README.md
									
									
									
									
									
								
							| @ -2,17 +2,17 @@ | |||||||
| 
 | 
 | ||||||
| Zammad is a web based open source helpdesk/ticket system with many features | Zammad is a web based open source helpdesk/ticket system with many features | ||||||
| to manage customer communication via several channels like telephone, facebook, | to manage customer communication via several channels like telephone, facebook, | ||||||
| twitter, chat and e-mails. It is distributed under the GNU AFFERO General Public | twitter, chat and emails. 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 emails and want to answer them with a team of agents? | ||||||
| You're going to love Zammad! | You're going to love Zammad! | ||||||
| 
 | 
 | ||||||
| ## Use case for this repo | ## Use case for this repository | ||||||
| 
 | 
 | ||||||
| This repo is meant to be the starting point for somebody who likes to use dockerized multi-container Zammad in production. | This repository 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> | [Learn more on Zammads documentation](https://docs.zammad.org/en/latest/install/docker-compose.html) | ||||||
| 
 | 
 | ||||||
| ## CI Status | ## CI Status | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2 | FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.3 | ||||||
| ARG BUILD_DATE | ARG BUILD_DATE | ||||||
| 
 | 
 | ||||||
| LABEL org.label-schema.build-date="$BUILD_DATE" \ | LABEL org.label-schema.build-date="$BUILD_DATE" \ | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user