build: Upgrade to go-1.21 and Alpine 3.18

Signed-off-by: Ernesto Ojeda <[email protected]>
edgexfoundry · Sep 15, 2023 · db6b7c2 · db6b7c2
1 parent ef214e1
commit db6b7c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-ARG BASE=golang:1.20-alpine3.17
+ARG BASE=golang:1.21-alpine3.18
 FROM ${BASE} AS builder
 
 ARG MAKE="make cmd/edgex-ui-server/edgex-ui-server"
@@ -41,7 +41,7 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
 COPY . .
 RUN ${MAKE}
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 EXPOSE 4000
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/edgexfoundry/edgex-ui-go
 
-go 1.20
+go 1.21
 
 require (
 	github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.1

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,8 +1,9 @@
-FROM node:16.17-alpine3.15
+FROM node:18-alpine3.18
 
 # Install Chromium for automated testing.
 RUN apk add --no-cache chromium
 ENV CHROME_BIN=/usr/bin/chromium-browser
+ENV NODE_OPTIONS=--openssl-legacy-provider
 
 ENV PATH /app/node_modules/.bin:$PATH
 
@@ -11,7 +12,7 @@ RUN npm install -g npm
 
 # Configure things to work with src mounted to "/app" directory.
 ARG USER=1000
-RUN deluser --remove-home node && \ 
+RUN deluser --remove-home node && \
     adduser -u $USER -D -s /bin/sh node
 USER $USER:$USER
 WORKDIR /app