Updates to build, deployment and development for OCP4 and Fider 0.21.1 (#42)

* OCP4 updates

* Trying w updated Node version

* Updating reference to Artifactory (sub-folder)

* Resolving 'Error shutting down storage: A layer is mounted: layer is in use by a container' issue

* Downgrading to go version pre-v18, to workaround go-gitea/gitea#19455

* Confirmed local workaround to Go V18+, now testing on OpenShift v4

* Moved SMTP override sed statement to after 'copy fider .'

* Trying again to debug 'layer is in use by a container'

* Debugging 2

* Debugging 3

* Debug mode enabled

* Updated fo OCP4 and SSO Shared Realm

Author: garywong-bc

Dockerfile.dev

@@ -1,44 +1,42 @@
 #####################
 ### Server Build Step
 #####################
-FROM golang:1.16.6-buster AS server-builder 
+FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.17-buster AS server-builder 
 
-ARG buildnumber=local
 
 RUN mkdir /server
 WORKDIR /server
 
-COPY . .
-RUN BUILDNUMBER=${buildnumber} GOOS=linux GOARCH=amd64 make build-server
+COPY fider/go.mod fider/go.sum ./
+RUN go mod download
+
+COPY fider .
+
+ARG COMMITHASH
+RUN COMMITHASH=${COMMITHASH} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-server
 
 #################
 ### UI Build Step
 #################
-FROM node:16-buster AS ui-builder 
+FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-buster AS ui-builder 
 
-RUN mkdir /ui
 WORKDIR /ui
 
-COPY . .
+COPY fider/package.json fider/package-lock.json ./
 RUN npm ci
+
+COPY fider .
 RUN make build-ssr
 RUN make build-ui
 
 ################
 ### Runtime Step
 ################
-FROM debian:buster-slim
+FROM --platform=${TARGETPLATFORM:-linux/amd64} debian:buster-slim
 
 RUN apt-get update
-RUN apt-get install -y ca-certificates wget
-
-# 'dockerize -wait'
-ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+RUN apt-get install -y ca-certificates
 
-RUN mkdir /app
 WORKDIR /app
 
 COPY --from=server-builder /server/migrations /app/migrations

Dockerfile.openshift

@@ -1,50 +1,54 @@
+ARG DOCKER_REGISTRY=docker.io/library
+
 #####################
 ### Server Build Step
 #####################
-FROM golang:1.16.6-buster AS server-builder 
+FROM --platform=${TARGETPLATFORM:-linux/amd64} $DOCKER_REGISTRY/golang:1.17-buster AS server-builder 
 
-ARG buildnumber=local
 
 RUN mkdir /server
 WORKDIR /server
 
+COPY fider/go.mod fider/go.sum ./
+RUN go mod download
+
 COPY fider .
 
-# BC Gov: Override SMTP TLS
+ARG COMMITHASH
 RUN sed -i -e '/auth :=/d' \
     -e 's/servername, smtpConfig.EnableStartTLS, auth, email/servername, false, nil, email/g' \
     -e 's/Config{ServerName: host}/Config{InsecureSkipVerify: true, ServerName: host}/g' \
     app/services/email/smtp/smtp.go && \
-    BUILDNUMBER=${buildnumber} GOOS=linux GOARCH=amd64 make build-server
+    COMMITHASH=${COMMITHASH} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-server
 
 #################
 ### UI Build Step
 #################
-FROM node:16-buster AS ui-builder 
+FROM --platform=${TARGETPLATFORM:-linux/amd64} $DOCKER_REGISTRY/node:16-buster AS ui-builder 
 
-RUN mkdir /ui
 WORKDIR /ui
 
+COPY fider/package.json fider/package-lock.json ./
+RUN npm ci
+RUN npx browserslist@latest --update-db 
+
 COPY fider .
 # Override SMTP TLS
 RUN sed -i -e '/auth :=/d' \
     -e 's/servername, smtpConfig.EnableStartTLS, auth, email/servername, false, nil, email/g' \
     -e 's/Config{ServerName: host}/Config{InsecureSkipVerify: true, ServerName: host}/g' \
     app/services/email/smtp/smtp.go 
-
-RUN npm ci
 RUN make build-ssr
 RUN make build-ui
 
 ################
 ### Runtime Step
 ################
-FROM debian:buster-slim
+FROM --platform=${TARGETPLATFORM:-linux/amd64} $DOCKER_REGISTRY/debian:buster-slim
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates
 
-RUN mkdir /app
 WORKDIR /app
 
 COPY --from=server-builder /server/migrations /app/migrations

README.md

@@ -83,9 +83,9 @@ To create an image stream using this forked code (replace `<tools-namespace>` wi
 
 Tag with the correct release version, matching the `major.minor` release tag at the source [repo](https://github.com/getfider/fider/releases). For example:
 
-> oc -n &lt;tools-namespace&gt; tag fider-bcgov:latest fider-bcgov:0.18.0
+> oc -n &lt;tools-namespace&gt; tag fider-bcgov:latest fider-bcgov:0.21.1
 
-NOTE: To update our Fider image, we would update the submodule (e.g. `0.19.0`) and then tag _this_ build as `latest`, and plan for a re-deploy using the newer image.
+NOTE: To update our Fider image, we would update the submodule (e.g. `0.21.1`) and then tag _this_ build as `latest`, and plan for a re-deploy using the newer image.
 
 > git submodule update --init --recursive
 
@@ -381,13 +381,13 @@ Authentication -> Add New
 OAuth2
 Client ID     : dds-portfolio
 Client Secret : <xxxxx>-<xxxx>-<xxxx>-<xxxx>-<xxxxx>
-Authorize URL : https://dev.oidc.gov.bc.ca/auth/realms/onestopauth-basic/protocol/openid-connect/auth
-Token URL     : https://dev.oidc.gov.bc.ca/auth/realms/onestopauth-basic/protocol/openid-connect/token
-Scope: openid, email, address, phone, roles
+Authorize URL : https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/auth
+Token URL     : https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token
+Scope: openid
 Profile API URL: (empty)
 JSON PATH
 	ID: 	sub
-	Name: 	name
+	Name: 	displayname
 	Email: email	
 ```
 

ci/openshift/fider-bcgov.bc.yaml

@@ -1,6 +1,6 @@
 ---
 kind: Template
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 message: A new Fider Image, customized with noTLS, has been created in your project
 metadata:
   name: nrm-feedback-bc
@@ -42,18 +42,21 @@ objects:
       strategy:
         type: Docker
         dockerStrategy:
-          from:
-            kind: DockerImage
-            name: debian:buster-slim
           dockerfilePath: Dockerfile.openshift
+          buildArgs:
+            - name: DOCKER_REGISTRY
+              value: artifacts.developer.gov.bc.ca/docker-remote
+              # value: docker.io/library              
+          pullSecret:
+            name: docker-pull-passthru
       output:
         to:
           kind: ImageStreamTag
           name: "${NAME}:${VERSION}"
       resources:
         limits:
-          cpu: 700m
-          memory: 4096Mi
+          cpu: 1500m
+          memory: 1800Mi
         requests:
           cpu: 500m
-          memory: 3020Mi
+          memory: 500Mi

ci/openshift/fider-bcgov.dc.yaml

@@ -1,6 +1,6 @@
 ---
 kind: Template
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 message: A new Fider application, customized with noTLS, has been created in your project
 metadata:
   name: nrmf-feedback-dc
@@ -16,7 +16,7 @@ parameters:
   - description: Version of Feedback image to be used (e.g. v0.18.0)
     displayName: Version of Fider Product Feedback
     name: IS_VERSION
-    value: 0.19.1
+    value: 0.21.1
   - description: The short-name of the Feedback Product, lower-case with hyphen.
     displayName: Feedback Product Name
     name: FEEDBACK_NAME

ci/openshift/postgresql.dc.yaml

@@ -1,6 +1,6 @@
 ---
 kind: Template
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 message: A new PostgreSQL application has been created in your project
 metadata:
   name: nrmfeedback-postgresql-dc
@@ -25,7 +25,7 @@ parameters:
     displayName: Database Volume Capacity
     name: DB_VOLUME_CAPACITY
     required: true
-    value: 4Gi
+    value: 2Gi
 objects:
   - kind: Secret
     apiVersion: v1