refactor: specify env variables as an object rather than as a list

Author: php-coder

infra/docker/postgres.yml

@@ -11,12 +11,12 @@ services:
   web:
     environment:
       # NOTE: it's better to have credentials the same as in src/main/resources/application-postgres.properties
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/mystamps
-      - SPRING_DATASOURCE_USERNAME=mystamps
-      - SPRING_DATASOURCE_PASSWORD=secret
-      - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
+      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/mystamps
+      SPRING_DATASOURCE_USERNAME: mystamps
+      SPRING_DATASOURCE_PASSWORD: secret
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver
       # to test whether it works in prod-like environment
-      #- SPRING_LIQUIBASE_CONTEXTS=scheme,init-data,prod-data
+      #SPRING_LIQUIBASE_CONTEXTS: scheme,init-data,prod-data
     #volumes:
       # to use a WAR file from filesystem and avoid to build an image every time
       #- ../../target/mystamps.war:/data/mystamps/mystamps.war:ro
@@ -31,9 +31,9 @@ services:
     image: postgres:11.3
     environment:
       # NOTE: it's better to have credentials the same as in .github/workflows/integration-tests-postgres.yml
-      - POSTGRES_USER=mystamps
-      - POSTGRES_PASSWORD=secret
-      - POSTGRES_DATABASE=mystamps
+      POSTGRES_USER: mystamps
+      POSTGRES_PASSWORD: secret
+      POSTGRES_DATABASE: mystamps
     networks:
       - internal-network
 

infra/docker/prod.yml

@@ -8,13 +8,13 @@
 services:
   web:
     environment:
-      - SPRING_PROFILES_ACTIVE=prod
+      SPRING_PROFILES_ACTIVE: prod
       # localhost -> db
-      - SPRING_DATASOURCE_URL=jdbc:mysql://db:3306/mystamps?logger=com.mysql.jdbc.log.Slf4JLogger&useSSL=false&logSlowQueries=true&slowQueryThresholdMillis=250&autoSlowLog=false&characterEncoding=UTF-8
+      SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/mystamps?logger=com.mysql.jdbc.log.Slf4JLogger&useSSL=false&logSlowQueries=true&slowQueryThresholdMillis=250&autoSlowLog=false&characterEncoding=UTF-8
       # override password from application-prod.properties to be the same as in db
-      - SPRING_DATASOURCE_PASSWORD=secret
+      SPRING_DATASOURCE_PASSWORD: secret
       # only for testing locally. See also: https://github.com/php-coder/mystamps/issues/670
-      - SERVER_SERVLET_SESSION_COOKIE_SECURE=false
+      SERVER_SERVLET_SESSION_COOKIE_SECURE: false
     volumes:
       - ./application-prod.properties:/data/mystamps/application-prod.properties:ro
     networks:
@@ -34,12 +34,12 @@ services:
       #
       # Example:
       # docker exec -it mystamps_db_1 mysql -u mystamps mystamps -psecret -e 'show tables'
-      - MYSQL_RANDOM_ROOT_PASSWORD=true
-      - MYSQL_USER=mystamps
+      MYSQL_RANDOM_ROOT_PASSWORD: true
+      MYSQL_USER: mystamps
       # FIXME: try to use a secret
-      - MYSQL_PASSWORD=secret
+      MYSQL_PASSWORD: secret
       # the user specified above will be granted superuser access automatically
-      - MYSQL_DATABASE=mystamps
+      MYSQL_DATABASE: mystamps
     ports:
       - '3306:3306'
     networks: