From 7206a62a49f098c816172a1d4c1f51af04f24e15 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 27 Oct 2023 09:32:43 -0500
Subject: [PATCH] tools/docker: use longer password (#11098)

---
 tools/docker/.env                | 2 +-
 tools/docker/dev-secrets.toml    | 4 ----
 tools/docker/develop.Dockerfile  | 2 +-
 tools/docker/docker-compose.yaml | 8 ++------
 4 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 tools/docker/dev-secrets.toml

diff --git a/tools/docker/.env b/tools/docker/.env
index 32de93edb42..05f4314ff22 100644
--- a/tools/docker/.env
+++ b/tools/docker/.env
@@ -4,7 +4,7 @@
 # Chainlink env vars
 CHAINLINK_DB_NAME=node_dev
 CL_DEV=true
-CHAINLINK_PGPASSWORD=node
+CHAINLINK_PGPASSWORD=thispasswordislongenough
 
 # Explorer env vars
 EXPLORER_DB_NAME=explorer_dev
diff --git a/tools/docker/dev-secrets.toml b/tools/docker/dev-secrets.toml
deleted file mode 100644
index b27b8a8a8e3..00000000000
--- a/tools/docker/dev-secrets.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-# dev only credentials
-
-[Database]
-AllowSimplePasswords = true
diff --git a/tools/docker/develop.Dockerfile b/tools/docker/develop.Dockerfile
index 46fad445d66..f663eaf1cf2 100644
--- a/tools/docker/develop.Dockerfile
+++ b/tools/docker/develop.Dockerfile
@@ -54,7 +54,7 @@ EXPOSE 8546
 
 # Default env setup for testing
 ENV CHAINLINK_DB_NAME chainlink_test
-ENV CHAINLINK_PGPASSWORD=node
+ENV CHAINLINK_PGPASSWORD=thispasswordislongenough
 ENV CL_DATABASE_URL=postgresql://postgres:$CHAINLINK_PGPASSWORD@localhost:5432/$CHAINLINK_DB_NAME?sslmode=disable
 ENV TYPEORM_USERNAME=postgres
 ENV TYPEORM_PASSWORD=node
diff --git a/tools/docker/docker-compose.yaml b/tools/docker/docker-compose.yaml
index 4d3ef7def20..c01d3579356 100644
--- a/tools/docker/docker-compose.yaml
+++ b/tools/docker/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     # Note that the keystore import allows us to submit transactions
     # immediately because addresses are specified when starting the
     # parity/geth node to be prefunded with eth.
-    entrypoint: /bin/sh -c "chainlink -c /run/secrets/config -s /run/secrets/secrets node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
+    entrypoint: /bin/sh -c "chainlink -c /run/secrets/config node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
     restart: always
     environment:
       - CL_DATABASE_URL
@@ -23,7 +23,6 @@ services:
       - apicredentials
       - keystore
       - config
-      - secrets
 
   node-2:
     container_name: chainlink-node-2
@@ -31,7 +30,7 @@ services:
     build:
       context: ../../
       dockerfile: core/chainlink.Dockerfile
-    entrypoint: /bin/sh -c "chainlink -c /run/secrets/config -s /run/secrets/secrets node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
+    entrypoint: /bin/sh -c "chainlink -c /run/secrets/config node start -d -p /run/secrets/node_password -a /run/secrets/apicredentials"
     restart: always
     environment:
       - CL_DATABASE_URL
@@ -44,7 +43,6 @@ services:
       - apicredentials
       - keystore
       - config
-      - secrets
 
 # TODO
 # - replace clroot with secrets
@@ -59,6 +57,4 @@ secrets:
     file: ../secrets/0xb90c7E3F7815F59EAD74e7543eB6D9E8538455D6.json
   config:
     file: config.toml
-  secrets:
-    file: dev-secrets.toml