search

skilld-labs / skilld-docker-container

Starterkit for drupal development
MIT License
20 stars 32 forks source link

Document make diff and unify output #365

Closed andypost closed 3 years ago

andypost commented 3 years ago

Follow-up to https://github.com/skilld-labs/skilld-docker-container/pull/364

skilld-docker-container$ make diff
diff -u0 --color .env .env.default || true; echo ""
--- .env    2021-03-11 10:38:12.547573021 +0200
+++ .env.default    2021-03-30 03:32:34.109671848 +0300
@@ -2 +2 @@
-COMPOSE_PROJECT_NAME=sdc
+COMPOSE_PROJECT_NAME=projectname
@@ -4 +4,2 @@
-MODULES=project_default_content better_normalizers default_content hal serialization
+DC_MODULES=project_default_content better_normalizers default_content hal serialization
+MG_MODULES=migrate_generator migrate migrate_plus migrate_source_csv migrate_tools

diff -u0 --color docker/docker-compose.override.yml docker/docker-compose.override.yml.default || true; echo ""
--- docker/docker-compose.override.yml  2021-04-22 04:32:52.042085239 +0300
+++ docker/docker-compose.override.yml.default  2021-03-30 03:32:34.113671888 +0300
@@ -17 +17 @@
-  <<: *service-newrelic
+#  <<: *service-newrelic
@@ -26 +25,0 @@
-#      NEW_RELIC_LICENSE_KEY: eu01xxfcd80284a580148d24afa86247a587NRAL
@@ -43,3 +42,3 @@
-#      BLACKFIRE_SERVER_ID: c191be4a-b8c3-41d9-b4f9-bdaa67ccdc88
-#      BLACKFIRE_SERVER_TOKEN: 1201f7339c743b4e9974e327863b477474faf979c029a8b45b7727139474269d
-#      BLACKFIRE_LOG_LEVEL: 4
+#      BLACKFIRE_SERVER_ID: x
+#      BLACKFIRE_SERVER_TOKEN: x
+#      BLACKFIRE_LOG_LEVEL: 1