@govuk-pay/cli 0.0.16 → 0.0.18

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/files/all.yaml

@@ -1,9 +1,7 @@
-version: '2.1'
-
 services:
   
     adminusers_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -11,7 +9,7 @@ services:
         driver: "json-file"
       container_name: adminusers_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -19,9 +17,11 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "19700:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
     connector_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -29,7 +29,7 @@ services:
         driver: "json-file"
       container_name: connector_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -37,9 +37,11 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "19300:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
     publicauth_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -47,7 +49,7 @@ services:
         driver: "json-file"
       container_name: publicauth_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -55,9 +57,11 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "19600:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
     products_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -65,7 +69,7 @@ services:
         driver: "json-file"
       container_name: products_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -73,9 +77,11 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "19800:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
     ledger_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -83,7 +89,7 @@ services:
         driver: "json-file"
       container_name: ledger_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -91,9 +97,11 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "20700:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
     webhooks_db:
-      image: postgres:15.2
+      image: postgres:15.6
       environment:
         - POSTGRES_PASSWORD=mysecretpassword
       mem_limit: 250M
@@ -101,7 +109,7 @@ services:
         driver: "json-file"
       container_name: webhooks_db
       healthcheck:
-        test: ["CMD-SHELL", "pg_isready"]
+        test: ["CMD-SHELL", "pg_isready -d postgres -U postgres"]
         interval: 10s
         timeout: 5s
         retries: 5
@@ -109,6 +117,8 @@ services:
         - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       ports:
         - "20800:5432"
+      networks:
+        - pay_local_mimic_aws_vpc
   
   
     adminusers:
@@ -139,6 +149,8 @@ services:
         
 
         
+
+        
         - AWS_SQS_REGION=eu-west-1
         - AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS=20
         - AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT=true
@@ -168,6 +180,8 @@ services:
         - "9700:9700"
         - "9701:9701"
       container_name: adminusers
+      networks:
+        - pay_local_mimic_aws_vpc
   
     connector:
       image: governmentdigitalservice/pay-connector:latest-master
@@ -197,6 +211,8 @@ services:
         
 
         
+
+        
         - AWS_SQS_REGION=eu-west-1
         - AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS=20
         - AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT=true
@@ -229,6 +245,8 @@ services:
         - "9300:9300"
         - "9301:9301"
       container_name: connector
+      networks:
+        - pay_local_mimic_aws_vpc
   
     cardid:
       image: governmentdigitalservice/pay-cardid:latest-master
@@ -249,6 +267,8 @@ services:
 
         
 
+        
+
         - ADMINUSERS_URL=http://adminusers:9700
         - CONNECTOR_URL=http://connector:9300
         - CARDID_URL=http://cardid:9900
@@ -269,6 +289,8 @@ services:
         - "9900:9900"
         - "9901:9901"
       container_name: cardid
+      networks:
+        - pay_local_mimic_aws_vpc
   
     publicauth:
       image: governmentdigitalservice/pay-publicauth:latest-master
@@ -298,6 +320,8 @@ services:
 
         
 
+        
+
         - ADMINUSERS_URL=http://adminusers:9700
         - CONNECTOR_URL=http://connector:9300
         - CARDID_URL=http://cardid:9900
@@ -318,6 +342,8 @@ services:
         - "9600:9600"
         - "9601:9601"
       container_name: publicauth
+      networks:
+        - pay_local_mimic_aws_vpc
   
     publicapi:
       image: governmentdigitalservice/pay-publicapi:latest-master
@@ -338,6 +364,8 @@ services:
 
         
 
+        
+
         - ADMINUSERS_URL=http://adminusers:9700
         - CONNECTOR_URL=http://connector:9300
         - CARDID_URL=http://cardid:9900
@@ -359,6 +387,8 @@ services:
         - "9100:9100"
         - "9101:9101"
       container_name: publicapi
+      networks:
+        - pay_local_mimic_aws_vpc
   
     products:
       image: governmentdigitalservice/pay-products:latest-master
@@ -388,6 +418,8 @@ services:
 
         
 
+        
+
         - ADMINUSERS_URL=http://adminusers:9700
         - CONNECTOR_URL=http://connector:9300
         - CARDID_URL=http://cardid:9900
@@ -408,6 +440,8 @@ services:
         - "18000:18000"
         - "18001:18001"
       container_name: products
+      networks:
+        - pay_local_mimic_aws_vpc
   
     ledger:
       image: governmentdigitalservice/pay-ledger:latest-master
@@ -437,6 +471,8 @@ services:
         
 
         
+
+        
         - AWS_SQS_REGION=eu-west-1
         - AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS=20
         - AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT=true
@@ -475,6 +511,8 @@ services:
         - "10700:10700"
         - "10701:10701"
       container_name: ledger
+      networks:
+        - pay_local_mimic_aws_vpc
   
     webhooks:
       image: governmentdigitalservice/pay-webhooks:latest-master
@@ -504,6 +542,8 @@ services:
         
 
         
+
+        
         - AWS_SQS_REGION=eu-west-1
         - AWS_SQS_MESSAGE_MAXIMUM_WAIT_TIME_IN_SECONDS=20
         - AWS_SQS_NON_STANDARD_SERVICE_ENDPOINT=true
@@ -533,19 +573,21 @@ services:
         - "10800:10800"
         - "10801:10801"
       container_name: webhooks
+      networks:
+        - pay_local_mimic_aws_vpc
   
   
   
-    selfservice:
-      image: governmentdigitalservice/pay-selfservice:latest-master
+    frontend:
+      image: governmentdigitalservice/pay-frontend:latest-master
       
-      env_file: services/selfservice.env
+      env_file: services/frontend.env
       environment:
         - SECURE_COOKIE_OFF=true
-        - NODE_ENV=${NODE_ENV:-production}
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
-        - PORT=9400
+        - PORT=9000
+        
 
         - ADMINUSERS_URL=http://adminusers:9700
 
@@ -571,21 +613,23 @@ services:
       working_dir: '/app'
       entrypoint: 'npm start'
       ports:
-        - "9400:9400"
+        - "9000:9000"
       logging:
         driver: "json-file"
-      container_name: selfservice
+      container_name: frontend
+      networks:
+        - pay_local_mimic_aws_vpc
   
-    products-ui:
-      image: governmentdigitalservice/pay-products-ui:latest-master
+    selfservice:
+      image: governmentdigitalservice/pay-selfservice:latest-master
       
-      env_file: services/products-ui.env
+      env_file: services/selfservice.env
       environment:
         - SECURE_COOKIE_OFF=true
-        - NODE_ENV=${NODE_ENV:-production}
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
-        - PORT=10400
+        - PORT=9400
+        
 
         - ADMINUSERS_URL=http://adminusers:9700
 
@@ -611,21 +655,23 @@ services:
       working_dir: '/app'
       entrypoint: 'npm start'
       ports:
-        - "10400:10400"
+        - "9400:9400"
       logging:
         driver: "json-file"
-      container_name: products-ui
+      container_name: selfservice
+      networks:
+        - pay_local_mimic_aws_vpc
   
-    stubs:
-      image: governmentdigitalservice/pay-stubs:latest-master
+    products-ui:
+      image: governmentdigitalservice/pay-products-ui:latest-master
       
-      env_file: services/stubs.env
+      env_file: services/products-ui.env
       environment:
         - SECURE_COOKIE_OFF=true
-        - NODE_ENV=${NODE_ENV:-production}
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
-        - PORT=3030
+        - PORT=10400
+        
 
         - ADMINUSERS_URL=http://adminusers:9700
 
@@ -651,21 +697,23 @@ services:
       working_dir: '/app'
       entrypoint: 'npm start'
       ports:
-        - "3030:3030"
+        - "10400:10400"
       logging:
         driver: "json-file"
-      container_name: stubs
+      container_name: products-ui
+      networks:
+        - pay_local_mimic_aws_vpc
   
-    toolbox:
-      image: governmentdigitalservice/pay-toolbox:latest-master
+    stubs:
+      image: governmentdigitalservice/pay-stubs:latest-master
       
-      env_file: services/toolbox.env
+      env_file: services/stubs.env
       environment:
         - SECURE_COOKIE_OFF=true
-        - NODE_ENV=${NODE_ENV:-production}
         - RUN_APP=true
         - DISABLE_INTERNAL_HTTPS=true
-        - PORT=3040
+        - PORT=3030
+        
 
         - ADMINUSERS_URL=http://adminusers:9700
 
@@ -673,7 +721,7 @@ services:
 
         - CARDID_URL=http://cardid:9900
 
-        - PUBLIC_AUTH_URL=http://publicauth:9600
+        - PUBLICAUTH_URL=http://publicauth:9600
 
         - PUBLICAPI_URL=http://publicapi:9100
 
@@ -691,22 +739,23 @@ services:
       working_dir: '/app'
       entrypoint: 'npm start'
       ports:
-        - "3040:3040"
+        - "3030:3030"
       logging:
         driver: "json-file"
-      container_name: toolbox
-  
+      container_name: stubs
+      networks:
+        - pay_local_mimic_aws_vpc
   
-    frontend:
-      image: governmentdigitalservice/pay-frontend:local
+    toolbox:
+      image: governmentdigitalservice/pay-toolbox:latest-master
       
-      env_file: services/frontend.env
+      env_file: services/toolbox.env
       environment:
         - SECURE_COOKIE_OFF=true
         - RUN_APP=true
-        - DISABLE_APPMETRICS=true
         - DISABLE_INTERNAL_HTTPS=true
-        - PORT=9000
+        - PORT=3040
+        
 
         - ADMINUSERS_URL=http://adminusers:9700
 
@@ -714,7 +763,7 @@ services:
 
         - CARDID_URL=http://cardid:9900
 
-        - PUBLICAUTH_URL=http://publicauth:9600
+        - PUBLIC_AUTH_URL=http://publicauth:9600
 
         - PUBLICAPI_URL=http://publicapi:9100
 
@@ -730,13 +779,15 @@ services:
         - TOOLBOX_URL=http://localhost:3040
       mem_limit: 1G
       working_dir: '/app'
-      entrypoint: npx nodemon --inspect=0.0.0.0:9001 start.js
+      entrypoint: 'npm start'
       ports:
-        - "9000:9000"
-        - "9001:9001"
+        - "3040:3040"
       logging:
         driver: "json-file"
-      container_name: frontend
+      container_name: toolbox
+      networks:
+        - pay_local_mimic_aws_vpc
+  
   
   
   
@@ -750,6 +801,8 @@ services:
         - "4566:4566" # All AWS services exposed on this port
       volumes:
         - /Users/jonathan.harden/gitdevel/github.com/alphagov/pay-infra/cli/lib/pay_cli/commands/local/files/localstack/init-aws.sh:/etc/localstack/init/ready.d/init-aws.sh
+      networks:
+        - pay_local_mimic_aws_vpc
   
   
     redis:
@@ -757,4 +810,17 @@ services:
       container_name: localRedis
       ports:
         - "6379:6379"
+      networks:
+        - pay_local_mimic_aws_vpc
   
+  
+
+networks:
+  pay_local_mimic_aws_vpc:
+    name: pay_local_mimic_aws_vpc
+    driver_opts:
+      com.docker.network.bridge.host_binding_ipv4: "127.0.0.1"
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.18.0.0/24

package/resources/legacy-ruby-cli/lib/pay_cli/commands/local/files/card.yaml

@@ -93,9 +93,8 @@ services:
         - "20800:5432"
   
   
-  
     adminusers:
-      image: governmentdigitalservice/pay-adminusers:local
+      image: governmentdigitalservice/pay-adminusers:latest-master
       
       depends_on:
         adminusers_db:
@@ -139,18 +138,16 @@ services:
         - LEDGER_URL=http://ledger:10700
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "9700:9700"
-          - "9701:9701"
+        - "9700:9700"
+        - "9701:9701"
       container_name: adminusers
   
     connector:
-      image: governmentdigitalservice/pay-connector:local
+      image: governmentdigitalservice/pay-connector:latest-master
       
       depends_on:
         connector_db:
@@ -197,18 +194,16 @@ services:
         - LEDGER_URL=http://ledger:10700
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "9300:9300"
-          - "9301:9301"
+        - "9300:9300"
+        - "9301:9301"
       container_name: connector
   
     cardid:
-      image: governmentdigitalservice/pay-cardid:local
+      image: governmentdigitalservice/pay-cardid:latest-master
       
       env_file:
         - services/java_app.env
@@ -234,18 +229,16 @@ services:
         - LEDGER_URL=http://ledger:10700
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "9900:9900"
-          - "9901:9901"
+        - "9900:9900"
+        - "9901:9901"
       container_name: cardid
   
     publicauth:
-      image: governmentdigitalservice/pay-publicauth:local
+      image: governmentdigitalservice/pay-publicauth:latest-master
       
       depends_on:
         publicauth_db:
@@ -280,18 +273,16 @@ services:
         - LEDGER_URL=http://ledger:10700
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "9600:9600"
-          - "9601:9601"
+        - "9600:9600"
+        - "9601:9601"
       container_name: publicauth
   
     publicapi:
-      image: governmentdigitalservice/pay-publicapi:local
+      image: governmentdigitalservice/pay-publicapi:latest-master
       
       env_file:
         - services/java_app.env
@@ -318,18 +309,16 @@ services:
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
         - REDIS_URL=redis
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "9100:9100"
-          - "9101:9101"
+        - "9100:9100"
+        - "9101:9101"
       container_name: publicapi
   
     ledger:
-      image: governmentdigitalservice/pay-ledger:local
+      image: governmentdigitalservice/pay-ledger:latest-master
       
       depends_on:
         ledger_db:
@@ -382,18 +371,16 @@ services:
         - SNS_ENABLED=true
         - PUBLISH_CARD_PAYMENT_EVENTS_TO_SNS=true
         - PUBLISH_CARD_PAYMENT_DISPUTE_EVENTS_TO_SNS=true
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "10700:10700"
-          - "10701:10701"
+        - "10700:10700"
+        - "10701:10701"
       container_name: ledger
   
     webhooks:
-      image: governmentdigitalservice/pay-webhooks:local
+      image: governmentdigitalservice/pay-webhooks:latest-master
       
       depends_on:
         webhooks_db:
@@ -437,26 +424,24 @@ services:
         - LEDGER_URL=http://ledger:10700
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      working_dir: '/app'
       mem_limit: 2G
-      user: root
       logging:
         driver: "json-file"
       ports:
-          - "10800:10800"
-          - "10801:10801"
+        - "10800:10800"
+        - "10801:10801"
       container_name: webhooks
   
   
   
     frontend:
-      image: node:18.18.2-alpine3.18
+      image: governmentdigitalservice/pay-frontend:latest-master
       
       env_file: services/frontend.env
       environment:
         - SECURE_COOKIE_OFF=true
+        - NODE_ENV=${NODE_ENV:-production}
         - RUN_APP=true
-        - DISABLE_APPMETRICS=true
         - DISABLE_INTERNAL_HTTPS=true
         - PORT=9000
 
@@ -474,20 +459,18 @@ services:
 
         - WEBHOOKS_URL=http://webhooks:10800
         - FRONTEND_URL=http://localhost:9000
-      volumes:
-        - "$WORKSPACE/pay-frontend:/app"
       mem_limit: 1G
       working_dir: '/app'
-      entrypoint: npx nodemon --inspect=0.0.0.0:9001 start.js
+      entrypoint: 'npm start'
       ports:
         - "9000:9000"
-        - "9001:9001"
       logging:
         driver: "json-file"
       container_name: frontend
   
   
   
+  
     localstack:
       image: localstack/localstack:3
       container_name: localstack