Commit graph

4 commits

Author SHA1 Message Date
dependabot[bot] b39339409a
build(deps): bump golang from 1.16.6 to 1.16.7 (#1231) 2021-08-06 08:59:59 +02:00
Jens Langhammer e62f5a75e4 outposts: fix git hash not being set in outposts
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
2021-07-21 21:31:25 +02:00
Jens Langhammer 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
Jens Langhammer 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
Renamed from outpost/proxy.Dockerfile (Browse further)