Merge pull request #144 from bcgov/2.3.9

2.3.9
bcgov · Nov 3, 2021 · 9ef8483 · 9ef8483
2 parents 36f470c + cf877f8
commit 9ef8483
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 36 deletions.
diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js
@@ -1,7 +1,7 @@
 "use strict";
 const options = require("@bcgov/pipeline-cli").Util.parseArguments();
 const changeId = options.pr; // aka pull-request
-const version = "2.3.7";
+const version = "2.3.9";
 const name = "transaction";
 
 Object.assign(options.git, { owner: "ychung-mot", repository: "TransAction" });
@@ -26,7 +26,7 @@ const phases = {
     instance: `${name}-dev-${changeId}`,
     version: `${version}-${changeId}`,
     tag: `dev-${version}-${changeId}`,
-    host: `transaction-${changeId}-55b94d-dev.apps.silver.devops.gov.bc.ca`,
+    host: `transaction-55b94d-dev.apps.silver.devops.gov.bc.ca`,
     dotnet_env: "Development",
     transient: true,
     resources: {

diff --git a/.pipeline/package-lock.json b/.pipeline/package-lock.json
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,15 +1,9 @@
-FROM image-registry.openshift-image-registry.svc:5000/55b94d-tools/node:1 AS builder
+FROM image-registry.openshift-image-registry.svc:5000/55b94d-tools/node-python:1 AS builder
 LABEL maintainer="youngjin.chung@gov.bc.ca"
 
 COPY . ./src
 
-RUN cd ./src && \
-    apk add --no-cache --virtual .gyp \
-    python \
-    make \
-    g++ && \
-    npm ci && \
-    npm run build
+RUN cd ./src && npm ci && npm run build
 
 FROM image-registry.openshift-image-registry.svc:5000/55b94d-tools/nginx-116-rhel8:1
 

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -6,7 +6,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.30",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",
     "@fortawesome/react-fontawesome": "^0.1.11",
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "bootstrap": "^4.5.2",
     "core-js": "^3.6.5",
     "http-proxy-middleware": "^1.0.5",

diff --git a/client/src/js/components/fragments/EventTeamStandings.js b/client/src/js/components/fragments/EventTeamStandings.js
@@ -11,11 +11,12 @@ class EventTeamStandings extends React.Component {
   componentDidMount() {
     this.setState({ loading: true });
 
-    Promise.all([this.props.fetchTeamStandings(this.props.eventId), this.props.fetchTeams('', 0, 2147483647)]).then(
-      () => {
-        this.setState({ loading: false });
-      }
-    );
+    Promise.all([
+      this.props.fetchTeamStandings(this.props.eventId, 200),
+      this.props.fetchTeams('', 0, 2147483647),
+    ]).then(() => {
+      this.setState({ loading: false });
+    });
   }
 
   renderContent() {
@@ -61,14 +62,11 @@ class EventTeamStandings extends React.Component {
   }
 }
 
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
   return {
     teamStandings: state.scores.teamStandings,
     teams: state.teams,
   };
 };
 
-export default connect(
-  mapStateToProps,
-  { fetchTeamStandings, fetchTeams }
-)(EventTeamStandings);
+export default connect(mapStateToProps, { fetchTeamStandings, fetchTeams })(EventTeamStandings);
diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml
@@ -17,7 +17,7 @@ objects:
         - annotations: null
           from:
             kind: DockerImage
-            name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-5
+            name: registry.redhat.io/dotnet/dotnet-31-rhel7:3.1-24
           name: "3.1"
           referencePolicy:
             type: Local

diff --git a/openshift/client-build-config.yaml b/openshift/client-build-config.yaml
@@ -36,6 +36,41 @@ objects:
           name: "1"
           referencePolicy:
             type: Local
+  - apiVersion: image.openshift.io/v1
+    kind: ImageStream
+    metadata:
+      creationTimestamp: null
+      labels:
+        shared: "true"
+      name: node-python
+    spec:
+      lookupPolicy:
+        local: false
+  - apiVersion: build.openshift.io/v1
+    kind: BuildConfig
+    metadata:
+      creationTimestamp: null
+      labels:
+        build: node-python
+      name: node-python
+    spec:
+      output:
+        to:
+          kind: ImageStreamTag
+          name: node-python:1
+      source:
+        type: Dockerfile
+        dockerfile: |
+          FROM image-registry.openshift-image-registry.svc:5000/55b94d-tools/node:1 AS builder
+          LABEL maintainer="young-jin.chung@gov.bc.ca"
+          RUN apk add --no-cache --virtual .gyp \
+            python \
+            make \
+            g++
+      strategy:
+        dockerStrategy:
+          noCache: true
+        type: Docker
   - apiVersion: v1
     kind: ImageStream
     metadata:

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
@@ -95,7 +95,7 @@ objects:
       annotations:
         haproxy.router.openshift.io/timeout: 1h
       creationTimestamp: null
-      name: ${NAME}${SUFFIX}
+      name: ${NAME}-${ENV}
     spec:
       host: ${HOST}
       path: "/"