reset dockerfiles to include old and new rds certs to not break other…

… dp3 deploys
transcom · Mar 31, 2022 · 02785df · 02785df
1 parent 451e75b
commit 02785df
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfile.dp3 b/Dockerfile.dp3
@@ -2,8 +2,8 @@
 FROM gcr.io/distroless/base:latest
 
 COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem
-# COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
-# COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
+COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
+COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
 COPY bin/milmove /bin/milmove
 
 # Demo Environment certs

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -6,7 +6,6 @@ RUN apk upgrade --no-cache busybox
 COPY config/tls/dod-wcf-root-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-root-ca-1.pem.crt
 COPY config/tls/dod-wcf-intermediate-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-intermediate-ca-1.pem.crt
 
-COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem
 COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
 COPY bin/milmove /bin/milmove

diff --git a/Dockerfile.tasks_dp3 b/Dockerfile.tasks_dp3
@@ -11,8 +11,8 @@ COPY config/tls/api.loadtest.dp3.us.chain.der.p7b /config/tls/api.loadtest.dp3.u
 COPY config/tls/api.exp.dp3.us.chain.der.p7b /config/tls/api.exp.dp3.us.chain.der.p7b
 
 COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem
-#COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
-#COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
+COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
+COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
 COPY bin/milmove-tasks /bin/milmove-tasks
 
 WORKDIR /bin
diff --git a/Dockerfile.webhook_client_dp3 b/Dockerfile.webhook_client_dp3
@@ -32,7 +32,7 @@ COPY --from=builder --chown=root:root /etc/ssl/certs /etc/ssl/certs
 
 COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem
 
-#COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
+COPY bin/rds-ca-us-gov-west-1-2017-root.pem /bin/rds-ca-us-gov-west-1-2017-root.pem
 COPY bin/webhook-client /bin/webhook-client
 
 CMD ["/bin/webhook-client", "webhook-notify"]