Chg: update image tag in helm values to v2.10.0

[WIFI-12664] Fixed firmware list dates in firmware upgrade modal

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -56,7 +56,7 @@ jobs:
       - docker
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: Telecominfraproject/.github
         path: github

.github/workflows/enforce-jira-issue-key.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout actions repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: Telecominfraproject/.github
           path: github

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       HELM_REPO_USERNAME: ucentral
     steps:
       - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: wlan-cloud-ucentralgw-ui
 

Dockerfile

@@ -1,6 +1,8 @@
-FROM node:14-alpine3.11 AS build
+FROM node:18.7.0-alpine3.15 AS build
 
-COPY package.json package-lock.json /
+WORKDIR /app
+
+COPY package.json package-lock.json /app/
 
 RUN npm install
 
@@ -8,8 +10,8 @@ COPY . .
 
 RUN npm run build
 
-FROM nginx:1.20.1-alpine AS runtime
+FROM nginx:1.22.0-alpine AS runtime
 
-COPY --from=build /build/ /usr/share/nginx/html/
+COPY --from=build /app/build/ /usr/share/nginx/html/
 
-COPY --from=build docker-entrypoint.d/40-generate-config.sh /docker-entrypoint.d/40-generate-config.sh
+COPY --from=build /app/docker-entrypoint.d/40-generate-config.sh /docker-entrypoint.d/40-generate-config.sh

docker-entrypoint.d/40-generate-config.sh

@@ -1,6 +1,32 @@
 #!/bin/ash
-# Check if variables are set
-export DEFAULT_OWSEC_URL="${DEFAULT_OWSEC_URL:-https://ucentral.dpaas.arilia.com:16001}"
-export ALLOW_OWSEC_CHANGE="${ALLOW_OWSEC_CHANGE:-false}"
 
-echo '{"DEFAULT_UCENTRALSEC_URL": "'$DEFAULT_UCENTRALSEC_URL'","ALLOW_UCENTRALSEC_CHANGE": '$ALLOW_UCENTRALSEC_CHANGE'}' > /usr/share/nginx/html/config.json
+ENV_CONFIG_PATH=/usr/share/nginx/html/env-config.js
+
+# Recreate config file
+rm -rf $ENV_CONFIG_PATH
+touch $ENV_CONFIG_PATH
+
+# Add assignment
+echo "window._env_ = {" >> $ENV_CONFIG_PATH
+
+# Read each line in .env file
+# Each line represents key=value pairs
+env | grep REACT_ | while read -r line || [[ -n "$line" ]];
+do
+  echo $line
+  # Split env variables by character `=`
+  if printf '%s\n' "$line" | grep -q -e '='; then
+    varname=$(printf '%s\n' "$line" | sed -e 's/=.*//')
+    varvalue=$(printf '%s\n' "$line" | sed -e 's/^[^=]*=//')
+  fi
+
+  # Read value of current variable if exists as Environment variable
+  value=$(printf '%s\n' "${!varname}")
+  # Otherwise use value from .env file
+  [[ -z $value ]] && value=${varvalue}
+
+  # Append configuration property to JS file
+  echo "  $varname: \"$value\"," >> $ENV_CONFIG_PATH
+done
+
+echo "}" >> $ENV_CONFIG_PATH

helm/values.yaml

@@ -8,7 +8,7 @@ fullnameOverride: ""
 images:
   owgwui:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw-ui
-    tag: main
+    tag: v2.10.0
     pullPolicy: Always
 
 services:
@@ -75,5 +75,4 @@ podAnnotations: {}
 
 # Application
 public_env_variables:
-  DEFAULT_UCENTRALSEC_URL: https://ucentral.dpaas.arilia.com:16001
-  ALLOW_UCENTRALSEC_CHANGE: false
+  REACT_APP_UCENTRALSEC_URL: https://ucentral.dpaas.arilia.com:16001