You've already forked dcmerge
							
							fix(lint): increase line length to 120
This commit is contained in:
		@@ -45,11 +45,11 @@ MD012:
 | 
				
			|||||||
# MD013/line-length - Line length
 | 
					# MD013/line-length - Line length
 | 
				
			||||||
MD013:
 | 
					MD013:
 | 
				
			||||||
  # Number of characters
 | 
					  # Number of characters
 | 
				
			||||||
  line_length: 80
 | 
					  line_length: 120
 | 
				
			||||||
  # Number of characters for headings
 | 
					  # Number of characters for headings
 | 
				
			||||||
  heading_line_length: 80
 | 
					  heading_line_length: 120
 | 
				
			||||||
  # Number of characters for code blocks
 | 
					  # Number of characters for code blocks
 | 
				
			||||||
  code_block_line_length: 80
 | 
					  code_block_line_length: 120
 | 
				
			||||||
  # Include code blocks
 | 
					  # Include code blocks
 | 
				
			||||||
  code_blocks: false
 | 
					  code_blocks: false
 | 
				
			||||||
  # Include tables
 | 
					  # Include tables
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  "rewrap.wrappingColumn": 120,
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										33
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										33
									
								
								README.md
									
									
									
									
									
								
							@@ -3,22 +3,18 @@
 | 
				
			|||||||
[](https://drone.cryptic.systems/volker.raschek/dcmerge)
 | 
					[](https://drone.cryptic.systems/volker.raschek/dcmerge)
 | 
				
			||||||
[](https://hub.docker.com/r/volkerraschek/dcmerge)
 | 
					[](https://hub.docker.com/r/volkerraschek/dcmerge)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
`dcmerge` is a small program to merge docker-compose files from multiple
 | 
					`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.
 | 
				
			||||||
sources. It is available via RPM and docker.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
The dynamic pattern of a docker-compose file, that for example `environments`
 | 
					The dynamic pattern of a docker-compose file, that for example `environments` can be specified as a string slice or a
 | 
				
			||||||
can be specified as a string slice or a list of objects is currently not
 | 
					list of objects is currently not supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports` and
 | 
				
			||||||
supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports`
 | 
					`volumes` must be declared as a slice of strings.
 | 
				
			||||||
and `volumes` must be declared as a slice of strings.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
Dockercompose file can be read-in from different sources. Currently are the
 | 
					Dockercompose file can be read-in from different sources. Currently are the following sources supported:
 | 
				
			||||||
following sources supported:
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
- File
 | 
					- File
 | 
				
			||||||
- HTTP/HTTPS
 | 
					- HTTP/HTTPS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Furthermore, `dcmerge` support different ways to merge multiple docker-compose
 | 
					Furthermore, `dcmerge` support different ways to merge multiple docker-compose files.
 | 
				
			||||||
files.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
- The default merge, add missing secrets, services, networks and volumes.
 | 
					- The default merge, add missing secrets, services, networks and volumes.
 | 
				
			||||||
- The existing-win merge, add and protect existing attributes.
 | 
					- The existing-win merge, add and protect existing attributes.
 | 
				
			||||||
@@ -26,9 +22,8 @@ files.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## default
 | 
					## default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Merge only missing secrets, services, networks and volumes without respecting
 | 
					Merge only missing secrets, services, networks and volumes **without respecting their attributes**. For example, when
 | 
				
			||||||
their attributes. For example, when the service `app` is already declared, it is
 | 
					the service `app` is already declared, it is not possible to add the service `app` twice. The second service will be
 | 
				
			||||||
not possible to add the service `app` twice. The second service will be
 | 
					 | 
				
			||||||
completely skipped.
 | 
					completely skipped.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```yaml
 | 
					```yaml
 | 
				
			||||||
@@ -68,10 +63,9 @@ services:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## existing-win
 | 
					## existing-win
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The existing-win merge protects existing attributes. For example there are two
 | 
					The existing-win merge protects existing attributes. For example there are two different docker-compose files, but booth
 | 
				
			||||||
different docker-compose files, but booth has the same environment variable
 | 
					has the same environment variable `CLIENT_SECRET` defined with different values. The first declaration of the attribute
 | 
				
			||||||
`CLIENT_SECRET` defined with different values. The first declaration of the
 | 
					wins and is for overwriting protected.
 | 
				
			||||||
attribute wins and is for overwriting protected.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
```yaml
 | 
					```yaml
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
@@ -99,9 +93,8 @@ services:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## last-win
 | 
					## last-win
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The last-win merge overwrite recursive existing attributes. For example there
 | 
					The last-win merge overwrite recursive existing attributes. For example there are two different docker-compose files,
 | 
				
			||||||
are two different docker-compose files, but booth has the same environment
 | 
					but booth has the same environment variable `CLIENT_SECRET` defined with different values. The last passed
 | 
				
			||||||
variable `CLIENT_SECRET` defined with different values. The last passed
 | 
					 | 
				
			||||||
docker-compose file which contains this environment wins.
 | 
					docker-compose file which contains this environment wins.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```yaml
 | 
					```yaml
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user