This is an automated email from the ASF dual-hosted git repository.
mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-go.git
The following commit(s) were added to refs/heads/master by this push:
new d380506 Fetch security fixes in build. Upgrade go versions. (#135)
d380506 is described below
commit d3805068f984d920be4c7eb168cb5cd9edf69122
Author: falkzoll <[email protected]>
AuthorDate: Thu Nov 19 16:13:27 2020 +0100
Fetch security fixes in build. Upgrade go versions. (#135)
- go 1.15 runtime upgraded to 1.15.5
- go 1.13 runtime upgraded to 1.13.15
- add 'apt-get upgrade' to the image build of go 1.15 and go 1.13 to get
latest security fixes during each build, for the case the base images are not
updated frequently
---
CHANGES.md | 5 +++++
golang1.13/Dockerfile | 21 +++++++++++++--------
golang1.15/Dockerfile | 21 +++++++++++++--------
3 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b977a42..e2f3ab5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,11 @@
# limitations under the License.
#
-->
+# (next release)
+- go 1.15 runtime upgraded to 1.15.5
+- go 1.13 runtime upgraded to 1.13.15
+- add 'apt-get upgrade' to the image build of go 1.15 and go 1.13 to get
latest security fixes during each build, for the case the base images are not
updated frequently
+
# 1.16.0
- added go 1.13 and 1.15 with Go modules
- removed support for go1.11 and go1.12
diff --git a/golang1.13/Dockerfile b/golang1.13/Dockerfile
index 816fe7a..59f7da7 100644
--- a/golang1.13/Dockerfile
+++ b/golang1.13/Dockerfile
@@ -14,24 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM golang:1.13.14
+FROM golang:1.13.15
RUN echo "deb http://deb.debian.org/debian buster-backports main contrib
non-free" \
>>/etc/apt/sources.list &&\
echo 'debconf debconf/frontend select Noninteractive' |
debconf-set-selections &&\
- apt-get update && apt-get install -y apt-utils
-RUN apt-get install -y \
+ apt-get update &&\
+ # Upgrade installed packages to get latest security fixes if the base
image does not contain them already.
+ apt-get upgrade -y --no-install-recommends &&\
+ apt-get install -y apt-utils &&\
+ apt-get install -y \
curl \
jq \
git \
vim &&\
apt-get -y install \
librdkafka1=0.11.6-1.1 \
- librdkafka++1=0.11.6-1.1 && \
+ librdkafka++1=0.11.6-1.1 &&\
apt-get -y install \
- librdkafka-dev=0.11.6-1.1 && \
- rm -rf /var/lib/apt/lists/* && \
- go get -u github.com/go-delve/delve/cmd/dlv
-RUN mkdir /action
+ librdkafka-dev=0.11.6-1.1 &&\
+ # Cleanup apt data, we do not need them later on.
+ apt-get clean && rm -rf /var/lib/apt/lists/* &&\
+ go get -u github.com/go-delve/delve/cmd/dlv &&\
+ mkdir /action
+
WORKDIR /action
ADD proxy /bin/proxy
ADD bin/compile /bin/compile
diff --git a/golang1.15/Dockerfile b/golang1.15/Dockerfile
index 6e6c4ec..c60eb17 100644
--- a/golang1.15/Dockerfile
+++ b/golang1.15/Dockerfile
@@ -14,24 +14,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM golang:1.15.1
+FROM golang:1.15.5
RUN echo "deb http://deb.debian.org/debian buster-backports main contrib
non-free" \
>>/etc/apt/sources.list &&\
echo 'debconf debconf/frontend select Noninteractive' |
debconf-set-selections &&\
- apt-get update && apt-get install -y apt-utils
-RUN apt-get install -y \
+ apt-get update &&\
+ # Upgrade installed packages to get latest security fixes if the base
image does not contain them already.
+ apt-get upgrade -y --no-install-recommends &&\
+ apt-get install -y apt-utils &&\
+ apt-get install -y \
curl \
jq \
git \
vim &&\
apt-get -y install \
librdkafka1=0.11.6-1.1 \
- librdkafka++1=0.11.6-1.1 && \
+ librdkafka++1=0.11.6-1.1 &&\
apt-get -y install \
- librdkafka-dev=0.11.6-1.1 && \
- rm -rf /var/lib/apt/lists/* && \
- go get -u github.com/go-delve/delve/cmd/dlv
-RUN mkdir /action
+ librdkafka-dev=0.11.6-1.1 &&\
+ # Cleanup apt data, we do not need them later on.
+ apt-get clean && rm -rf /var/lib/apt/lists/* &&\
+ go get -u github.com/go-delve/delve/cmd/dlv &&\
+ mkdir /action
+
WORKDIR /action
ADD proxy /bin/proxy
ADD bin/compile /bin/compile
