Adding changes missed to new Dockerfile (due to rebase).
Also removed now-redundant GO111MODULE=on flag.
VOL-2647
Change-Id: I8c6d00985570f6b5ddddd385f3d00ad96a0541dc
diff --git a/docker/Dockerfile.rw_core b/docker/Dockerfile.rw_core
index 76bc42e..2877dee 100644
--- a/docker/Dockerfile.rw_core
+++ b/docker/Dockerfile.rw_core
@@ -20,11 +20,6 @@
# Install required packages
RUN apk add --no-cache build-base=0.5-r1
-# Golang container has GOPATH set to /go by default. Hence, need to explicitly enable
-# Go modules while using folder /go/src under GOPATH as build path; lest go modules
-# will be disabled
-ENV GO111MODULE=on
-
# Use Standard go build directory structure
WORKDIR /go/src
diff --git a/docker/Dockerfile.rw_core_profile b/docker/Dockerfile.rw_core_profile
index 3f7d3f1..68ecc92 100644
--- a/docker/Dockerfile.rw_core_profile
+++ b/docker/Dockerfile.rw_core_profile
@@ -15,21 +15,10 @@
# -------------
# Build stage
-FROM golang:1.12-alpine3.9 AS build-env
+FROM golang:1.13.8-alpine3.11 AS build-env
# Install required packages
-RUN apk add --no-cache \
- wget=1.20.3-r0 \
- git=2.20.2-r0 \
- make=4.2.1-r2 \
- build-base=0.5-r1 \
- protobuf=3.6.1-r1 \
- protobuf-dev=3.6.1-r1
-
-# Golang container has GOPATH set to /go by default. Hence, need to explicitly enable
-# Go modules while using folder /go/src under GOPATH as build path; lest go modules
-# will be disabled
-ENV GO111MODULE=on
+RUN apk add --no-cache build-base=0.5-r1
# Use Standard go build directory structure
WORKDIR /go/src
@@ -67,7 +56,7 @@
# -------------
# Image creation stage
-FROM alpine:3.9.4
+FROM alpine:3.11.3
# Set the working directory
WORKDIR /app