Merge pull request #169 from certego/develop

1.3.0

.github/actions/services/action.yml

@@ -30,13 +30,16 @@ inputs:
       postgres_password:
         description: Postgres service password. Requires use_postgres to be true
         required: true
-
+      postgres_version:
+        description: Postgres alpine version
+        required: true
 
 runs:
   using: "composite"
   steps:
 
         - name: Create mongo docker-compose file
+          if: inputs.use_mongo
           run: |
             echo "version: '3.7'" > mongo.yml
             echo "services:" >> mongo.yml
@@ -53,11 +56,12 @@ runs:
             bash
 
         - name: Create postgres docker-compose file
+          if: inputs.use_postgres
           run: |
             echo "version: '3.7'" > postgres.yml
             echo "services:" >> postgres.yml
             echo "  postgres:" >> postgres.yml
-            echo "    image: library/postgres:10.14-alpine" >> postgres.yml
+            echo "    image: library/postgres:${{ inputs.postgres_version }} -alpine" >> postgres.yml
             echo "    container_name: postgres" >> postgres.yml
             echo "    environment:" >> postgres.yml
             echo "      POSTGRES_DB: ${{ inputs.postgres_db }}" >> postgres.yml
@@ -74,6 +78,7 @@ runs:
             bash
 
         - name: Create elasticsearch docker-compose file
+          if: inputs.use_elastic_search
           run: |
             echo "version: '3.7'" > elastic_search.yml
             echo "services:" >> elastic_search.yml
@@ -94,6 +99,7 @@ runs:
             bash
 
         - name: Create memcached docker-compose file
+          if: inputs.use_memcached
           run: |
             echo "version: '3.7'" > memcached.yml
             echo "services:" >> memcached.yml
@@ -106,6 +112,7 @@ runs:
             bash
 
         - name: Create redis docker-compose file
+          if: inputs.use_redis
           run: |
             echo "version: '3.7'" > redis.yml
             echo "services:" >> redis.yml

.github/workflows/_python.yml

@@ -179,6 +179,11 @@ on:
         type: string
         required: false
         default: password
+      postgres_version:
+        description: Postgres service version. Requires use_postgres to be true
+        type: string
+        required: false
+        default: 10.14
 
       celery_app:
         description: Celery app name. Requires use_celery to be true
@@ -407,6 +412,7 @@ jobs:
           postgres_db: ${{ inputs.postgres_db }}
           postgres_user: ${{ inputs.postgres_user }}
           postgres_password: ${{ inputs.postgres_password }}
+          postgres_version: ${{ inputs.postgres_version }}
 
       - name: Start celery worker
         if: inputs.use_celery

actions/services/action.yml

@@ -30,13 +30,16 @@ inputs:
       postgres_password:
         description: Postgres service password. Requires use_postgres to be true
         required: true
-
+      postgres_version:
+        description: Postgres alpine version
+        required: true
 
 runs:
   using: "composite"
   steps:
 
         - name: Create mongo docker-compose file
+          if: inputs.use_mongo
           run: |
             echo "version: '3.7'" > mongo.yml
             echo "services:" >> mongo.yml
@@ -53,11 +56,12 @@ runs:
             bash
 
         - name: Create postgres docker-compose file
+          if: inputs.use_postgres
           run: |
             echo "version: '3.7'" > postgres.yml
             echo "services:" >> postgres.yml
             echo "  postgres:" >> postgres.yml
-            echo "    image: library/postgres:10.14-alpine" >> postgres.yml
+            echo "    image: library/postgres:${{ inputs.postgres_version }} -alpine" >> postgres.yml
             echo "    container_name: postgres" >> postgres.yml
             echo "    environment:" >> postgres.yml
             echo "      POSTGRES_DB: ${{ inputs.postgres_db }}" >> postgres.yml
@@ -74,6 +78,7 @@ runs:
             bash
 
         - name: Create elasticsearch docker-compose file
+          if: inputs.use_elastic_search
           run: |
             echo "version: '3.7'" > elastic_search.yml
             echo "services:" >> elastic_search.yml
@@ -94,6 +99,7 @@ runs:
             bash
 
         - name: Create memcached docker-compose file
+          if: inputs.use_memcached
           run: |
             echo "version: '3.7'" > memcached.yml
             echo "services:" >> memcached.yml
@@ -106,6 +112,7 @@ runs:
             bash
 
         - name: Create redis docker-compose file
+          if: inputs.use_redis
           run: |
             echo "version: '3.7'" > redis.yml
             echo "services:" >> redis.yml

configurations/node_linters/README.md

@@ -50,7 +50,7 @@ In `.vscode/settings.json`
 ```json
 {
     "eslint.options": {
-        "configFile": ".github/configurations/node_linters/eslint/.eslintrc.json"
+        "overrideConfigFile": ".github/configurations/node_linters/eslint/.eslintrc.json"
     },
     "stylelint.configFile": ".github/configurations/node_linters/stylelint/.stylelintrc.json",
     "prettier.configPath": ".github/configurations/node_linters/prettier/.prettierrc.js",

workflows/_python.yml

@@ -179,6 +179,11 @@ on:
         type: string
         required: false
         default: password
+      postgres_version:
+        description: Postgres service version. Requires use_postgres to be true
+        type: string
+        required: false
+        default: 10.14
 
       celery_app:
         description: Celery app name. Requires use_celery to be true
@@ -407,6 +412,7 @@ jobs:
           postgres_db: ${{ inputs.postgres_db }}
           postgres_user: ${{ inputs.postgres_user }}
           postgres_password: ${{ inputs.postgres_password }}
+          postgres_version: ${{ inputs.postgres_version }}
 
       - name: Start celery worker
         if: inputs.use_celery