ci: avoid redis port var name collision

REDIS_PORT is set in our hosting environment, so I'm setting it to "REDIS_CUSTOM_PORT" to avoid potential collisions
vuestorefront · Apr 5, 2022 · 07b5270 · 07b5270
1 parent ea50ca1
commit 07b5270
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/deploy-vue-storefront-cloud.yml b/.github/workflows/deploy-vue-storefront-cloud.yml
@@ -26,7 +26,7 @@ jobs:
           password: ${{ secrets.CLOUD_PASSWORD }}
           dockerfile: .vuestorefrontcloud/docker/Dockerfile
           buildoptions: --compress
-          buildargs: NPM_EMAIL,NPM_PASS,NPM_USER,NPM_REGISTRY,STORE_URL,MAGENTO_BASE_URL,MAGENTO_GRAPHQL_URL,MAGENTO_EXTERNAL_CHECKOUT_ENABLED,MAGENTO_EXTERNAL_CHECKOUT_URL,MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH,IMAGE_PROVIDER,IMAGE_PROVIDER_BASE_URL,REDIS_HOST,REDIS_PORT,REDIS_CACHE_INVALIDATE_KEY,REDIS_CACHE_INVALIDATE_URL,REDIS_KEY_PREFIX,REDIS_ENABLED,SENTRY_DSN,RECAPTCHA_ENABLED,RECAPTCHA_HIDE_BADGE,RECAPTCHA_VERSION,RECAPTCHA_SIZE,RECAPTCHA_MIN_SCORE,RECAPTCHA_SITE_KEY,RECAPTCHA_SECRET_KEY
+          buildargs: NPM_EMAIL,NPM_PASS,NPM_USER,NPM_REGISTRY,STORE_URL,MAGENTO_BASE_URL,MAGENTO_GRAPHQL_URL,MAGENTO_EXTERNAL_CHECKOUT_ENABLED,MAGENTO_EXTERNAL_CHECKOUT_URL,MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH,IMAGE_PROVIDER,IMAGE_PROVIDER_BASE_URL,REDIS_HOST,REDIS_CUSTOM_PORT,REDIS_CACHE_INVALIDATE_KEY,REDIS_CACHE_INVALIDATE_URL,REDIS_KEY_PREFIX,REDIS_ENABLED,SENTRY_DSN,RECAPTCHA_ENABLED,RECAPTCHA_HIDE_BADGE,RECAPTCHA_VERSION,RECAPTCHA_SIZE,RECAPTCHA_MIN_SCORE,RECAPTCHA_SITE_KEY,RECAPTCHA_SECRET_KEY
         env:
           NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
           NPM_USER: ${{ secrets.CLOUD_USERNAME }}
@@ -46,7 +46,7 @@ jobs:
 
           REDIS_ENABLED: true
           REDIS_HOST: localhost
-          REDIS_PORT: 6379
+          REDIS_CUSTOM_PORT: 6379
           REDIS_KEY_PREFIX: ${{ github.sha }}
           REDIS_CACHE_INVALIDATE_KEY: magento2vsf2
           REDIS_CACHE_INVALIDATE_URL: /cache-invalidate

diff --git a/.vuestorefrontcloud/docker/Dockerfile b/.vuestorefrontcloud/docker/Dockerfile
@@ -15,7 +15,7 @@ ARG IMAGE_PROVIDER
 ARG IMAGE_PROVIDER_BASE_URL
 ARG REDIS_ENABLED
 ARG REDIS_HOST
-ARG REDIS_PORT
+ARG REDIS_CUSTOM_PORT
 ARG REDIS_KEY_PREFIX
 ARG REDIS_CACHE_INVALIDATE_URL
 ARG REDIS_CACHE_INVALIDATE_KEY
@@ -42,7 +42,7 @@ ENV IMAGE_PROVIDER=${IMAGE_PROVIDER}
 ENV IMAGE_PROVIDER_BASE_URL=${IMAGE_PROVIDER_BASE_URL}
 ENV REDIS_ENABLED=${REDIS_ENABLED}
 ENV REDIS_HOST=${REDIS_HOST}
-ENV REDIS_PORT=${REDIS_PORT}
+ENV REDIS_CUSTOM_PORT=${REDIS_CUSTOM_PORT}
 ENV REDIS_KEY_PREFIX=${REDIS_KEY_PREFIX}
 ENV REDIS_CACHE_INVALIDATE_KEY=${REDIS_CACHE_INVALIDATE_KEY}
 ENV REDIS_CACHE_INVALIDATE_URL=${REDIS_CACHE_INVALIDATE_URL}

diff --git a/docs/guide/ssr.md b/docs/guide/ssr.md
@@ -51,7 +51,7 @@ Once you have the Redis driver installed, you need to add the Redis configuratio
 ```
 .env
 REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
+REDIS_CUSTOM_PORT=6379
 REDIS_PASSWORD=
 REDIS_KEY_PREFIX=
 REDIS_CACHE_INVALIDATE_URL=/cache-invalidate
@@ -77,7 +77,7 @@ Then you have to update `nuxt.config.js file` and add this to the `modules` obje
       redis: {
         keyPrefix: process.env.REDIS_KEY_PREFIX,
         host: process.env.REDIS_HOST,
-        port: process.env.REDIS_PORT,
+        port: process.env.REDIS_CUSTOM_PORT,
       },
     },
   ],

diff --git a/packages/theme/.env.example b/packages/theme/.env.example
@@ -14,7 +14,7 @@ IMAGE_PROVIDER_BASE_URL=https://res-4.cloudinary.com/{YOUR_ID}/image/upload/
 
 REDIS_ENABLED=false
 REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
+REDIS_CUSTOM_PORT=6379
 REDIS_KEY_PREFIX=
 REDIS_CACHE_INVALIDATE_URL=/cache-invalidate
 

diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
@@ -118,7 +118,7 @@ export default () => {
             redis: {
               keyPrefix: process.env.REDIS_KEY_PREFIX,
               host: process.env.REDIS_HOST,
-              port: process.env.REDIS_PORT,
+              port: process.env.REDIS_CUSTOM_PORT,
             },
           },
         ],