| 
						
					 | 
					
						
						
							
						
						be9ca48de0
					 | 
					
						
						
							
							root: fix docker stage name
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-07-17 16:40:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b3159a74e5
					 | 
					
						
						
							
							Merge branch 'master' into inbuilt-proxy
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
#	Dockerfile
#	internal/outpost/ak/api.go
#	internal/outpost/ak/api_uag.go
#	internal/outpost/ak/global.go
#	internal/outpost/ldap/api_tls.go
#	internal/outpost/ldap/instance_bind.go
#	internal/outpost/ldap/utils.go
#	internal/outpost/proxy/api_bundle.go
#	outpost/go.mod
#	outpost/go.sum
#	outpost/pkg/ak/cert.go 
						
						
					 | 
					
						2021-07-17 12:49:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff42663d3c
					 | 
					
						
						
							
							root: more code merging
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-06-29 16:21:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1005f341e4
					 | 
					
						
						
							
							Merge branch 'master' into inbuilt-proxy
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
#	internal/constants/constants.go
#	outpost/pkg/version.go 
						
						
					 | 
					
						2021-06-23 20:41:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b98895ac2c
					 | 
					
						
						
							
							root: add more common utils
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-06-16 17:29:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						690b7be1d8
					 | 
					
						
						
							
							root: initial merging of outpost and main project
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-06-16 12:02:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d26fa0403
					 | 
					
						
						
							
							gproxy: add sentry integration
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-05-04 14:28:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42f9ba8efe
					 | 
					
						
						
							
							gproxy: load default config file for debug and listen statements
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-05-04 14:10:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						988cf15b71
					 | 
					
						
						
							
							root: initial go proxy, update compose and helm
						
						
						
						
						
						
						
						Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> 
						
						
					 | 
					
						2021-05-03 09:39:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |