-
This commit is contained in:
@@ -64,8 +64,13 @@ metadata:
|
||||
namespace: mail
|
||||
data:
|
||||
# postfix-accounts.cf: |
|
||||
<<<<<<< HEAD
|
||||
# sebastian@undercloud.dev|{SHA512-CRYPT}$6$ACOZB1B.2yHv8ePj$9vIW46wFqHfIMlP9.sDE1xtk1XN5OhS6etnvv5AxDPVPMFXXx55dVNwybLAaS/YEKahPg56vE9d6CIl7pYDw41
|
||||
# glodas@undercloud.dev|{SHA512-CRYPT}$6$ACOZB1B.2yHv8ePj$9vIW46wFqHfIMlP9.sDE1xtk1XN5OhS6etnvv5AxDPVPMFXXx55dVNwybLAaS/YEKahPg56vE9d6CIl7pYDw41
|
||||
=======
|
||||
# sebastian@undercloud.cf|{SHA512-CRYPT}$6$ACOZB1B.2yHv8ePj$9vIW46wFqHfIMlP9.sDE1xtk1XN5OhS6etnvv5AxDPVPMFXXx55dVNwybLAaS/YEKahPg56vE9d6CIl7pYDw41
|
||||
# glodas@undercloud.cf|{SHA512-CRYPT}$6$ACOZB1B.2yHv8ePj$9vIW46wFqHfIMlP9.sDE1xtk1XN5OhS6etnvv5AxDPVPMFXXx55dVNwybLAaS/YEKahPg56vE9d6CIl7pYDw41
|
||||
>>>>>>> 874d7c1df4d2e0a213b94e83e6a8ec14c0123be3
|
||||
---
|
||||
kind: ConfigMap
|
||||
apiVersion: v1
|
||||
@@ -148,7 +153,11 @@ spec:
|
||||
# readOnly: false
|
||||
containers:
|
||||
- name: docker-mailserver
|
||||
<<<<<<< HEAD
|
||||
image: mailserver/docker-mailserver:latest
|
||||
=======
|
||||
image: docker.io/mailserver/docker-mailserver:latest
|
||||
>>>>>>> 874d7c1df4d2e0a213b94e83e6a8ec14c0123be3
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: true
|
||||
|
||||
Reference in New Issue
Block a user