Merge branch 'main' into UML-3764-remove-one-login-feature-flag

# Conflicts:
#	service-front/app/features/context/Integration/AccountContext.php

Makefile

@@ -53,6 +53,12 @@ rebuild:
 	$(COMPOSE) build --no-cache $(filter-out $@,$(MAKECMDGOALS))
 .PHONY: rebuild
 
+reset:
+	$(MAKE) rebuild
+	$(MAKE) pull
+	$(MAKE) composer_install
+.PHONY: reset
+
 down:
 	$(COMPOSE) down $(filter-out $@,$(MAKECMDGOALS))
 .PHONY: down

docker-compose.yml

@@ -56,10 +56,9 @@ services:
       AWS_ACCESS_KEY_ID: "devkey"
       AWS_SECRET_ACCESS_KEY: "secretdevkey"
       LOGGING_LEVEL: "100" # \Monolog\Logger::DEBUG
-      ENABLE_XDEBUG: "true"
       PHP_IDE_CONFIG: serverName=viewer-app
       XDEBUG_CONFIG: client_host=host.docker.internal client_port=9000
-      XDEBUG_MODE: develop,debug,coverage
+      XDEBUG_MODE: develop,debug,coverage # off # xdebug can be disable by replacing modes with "off"
       SESSION_EXPIRES: 30 # session expiry length to support timeout message.
       COOKIE_EXPIRES: 1440 # cookie expiry for complete logout - initial value to be 24 hours.
       SUPPORT_DATASTORE_LPAS: "false"
@@ -111,10 +110,9 @@ services:
       AWS_ACCESS_KEY_ID: "devkey"
       AWS_SECRET_ACCESS_KEY: "secretdevkey"
       LOGGING_LEVEL: "100" # \Monolog\Logger::DEBUG
-      ENABLE_XDEBUG: "true"
       PHP_IDE_CONFIG: serverName=actor-app
       XDEBUG_CONFIG: client_host=host.docker.internal client_port=9000
-      XDEBUG_MODE: develop,debug,coverage
+      XDEBUG_MODE: develop,debug,coverage # off # xdebug can be disable by replacing modes with "off"
       SESSION_EXPIRES: 20 # session expiry length to support timeout message.
       SESSION_EXPIRY_WARNING: 5 # session expiry warning time to trigger popup window.
       COOKIE_EXPIRES: 1440 # cookie expiry for complete logout - initial value to be 24 hours.
@@ -198,10 +196,9 @@ services:
       LPA_CODES_STATIC_AUTH_TOKEN: asdf1234567890
       PACT_BROKER_PUBLISH: "false"
       LOGGING_LEVEL: "100" # \Monolog\Logger::DEBUG
-      ENABLE_XDEBUG: "true"
       PHP_IDE_CONFIG: serverName=api-app
       XDEBUG_CONFIG: client_host=host.docker.internal client_port=9000
-      XDEBUG_MODE: develop,debug,coverage
+      XDEBUG_MODE: develop,debug,coverage # off # xdebug can be disable by replacing modes with "off"
       NOTIFY_API_KEY:
 
   api-composer:

service-api/docker/app/Dockerfile

@@ -47,14 +47,12 @@ COPY --from=composer /usr/bin/composer /usr/bin/
 COPY service-api/docker/app/app-php.development.ini /usr/local/etc/php/conf.d/app-php.ini
 
 RUN set -xe \
-  && install-php-extensions xdebug-stable \
-  && rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  && install-php-extensions xdebug-stable
 
 # Development images are only ever run using compose so will have this mounted in as a volume
 RUN rm -rf /app/vendor
 
-CMD ([[ -z "${ENABLE_XDEBUG}" ]] || docker-php-ext-enable xdebug) \
-  && php-fpm
+CMD ["php-fpm"]
 
 #
 # For safety reasons have the production image be the output