Merge branch 'develop'

.github/workflows/deploy.yml

@@ -149,7 +149,9 @@ jobs:
 
       - name: Copy env variables to docker
         run: |
-          echo "${{ secrets[format('{0}_CMS_ENV_TF_MANAGED', steps.extract_environment.outputs.environment)] }}" > cms/.env
+          echo "${{ secrets[format('{0}_CMS_ENV', steps.extract_environment.outputs.environment)] }}" > cms/.env
+          # append Terraform managed secrets
+          echo "${{ secrets[format('{0}_CMS_ENV_TF_MANAGED', steps.extract_environment.outputs.environment)] }}" >> cms/.env
 
       - name: Build and Push Container
         env:

.github/workflows/localazy-release.yml

@@ -0,0 +1,20 @@
+name: Release tag on Localazy
+on: 
+  push:
+    workflow_dispatch:
+    branches:
+      - main
+
+jobs:
+  localazy-release:
+    name: Release strings to production on Localazy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: localazy/tag@v1
+        with:
+          workdir: 'frontend'
+          read_key: ${{ secrets.LOCALAZY_READ_KEY }}
+          write_key: ${{ secrets.LOCALAZY_WRITE_KEY }}
+          promote_from: 'latest'
+          promote_to: 'production'

.github/workflows/localazy-upload.yml

@@ -0,0 +1,18 @@
+name: Upload to Localazy
+on: 
+  push:
+    workflow_dispatch:
+    branches:
+      - develop
+
+jobs:
+  localazy-upload:
+    name: Upload strings to Localazy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: localazy/upload@v1
+        with:
+          workdir: 'frontend'
+          read_key: ${{ secrets.LOCALAZY_READ_KEY }}
+          write_key: ${{ secrets.LOCALAZY_WRITE_KEY }}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.analysis.autoImportCompletions": false,
+    "python.analysis.typeCheckingMode": "basic"
+}

cms/.env.example

@@ -12,4 +12,6 @@ DATABASE_PORT=5432
 DATABASE_NAME=
 DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=postgres
-DATABASE_SSL=false
+DATABASE_SSL=false
+
+STRAPI_ADMIN_LOCALAZY_ENV=

cms/Dockerfile

@@ -18,25 +18,14 @@ ENV NODE_ENV development
 
 WORKDIR /app
 
-COPY .yarn ./.yarn
-COPY config ./config
-COPY database ./database
-COPY public ./public
-COPY src ./src
-
-COPY .env \
-     .nvmrc \
-     .yarnrc.yml \
-     favicon.png \
-     package.json \
-     entrypoint.sh \
-     tsconfig.json \
-     yarn.lock \
-     ./
-
-RUN yarn install
+COPY . .
+
+RUN yarn install --immutable
 
 ENV PATH /app/node_modules/.bin:$PATH
+RUN chown -R node:node /app
+USER node
 
 EXPOSE 1337
+
 ENTRYPOINT ["/app/entrypoint.sh"]

cms/config/api.ts

@@ -1,7 +1,7 @@
 export default {
   rest: {
     defaultLimit: 25,
-    maxLimit: 300,
+    maxLimit: 100000, // Limit can't be below around 30k
     withCount: true,
   },
 };

cms/config/logger.ts

@@ -0,0 +1,8 @@
+'use strict';
+
+import { formats } from '@strapi/logger'
+
+export default {
+  // Remove the colors from the logs since they're not visible in GCP
+  format: formats.prettyPrint({ colors: false })
+};

cms/config/middlewares.ts

@@ -1,9 +1,9 @@
 export default [
+  'strapi::logger',
   'strapi::errors',
   'strapi::security',
   'strapi::cors',
   'strapi::poweredBy',
-  'strapi::logger',
   'strapi::query',
   {
     name: 'strapi::body',

cms/config/plugins.ts

@@ -39,12 +39,13 @@ module.exports = {
       // importOnBootstrap: false,
       // customTypes: [],
       // excludedTypes: [],
-      // excludedConfig: [
-      //   "core-store.plugin_users-permissions_grant",
-      // 	"core-store.plugin_upload_metrics",
-      // 	"core-store.strapi_content_types_schema",
-	    //   "core-store.ee_information",
-      // ],
+      excludedConfig: [
+        "core-store.plugin_users-permissions_grant",
+        "core-store.plugin_upload_metrics",
+        "core-store.strapi_content_types_schema",
+        "core-store.ee_information",
+        "core-store.plugin_localazy_identity"
+      ],
     },
   },
 };