Skip to content

Commit

Permalink
Update to go 1.12.17, include secuity fixes in build. (#124)
Browse files Browse the repository at this point in the history
- Updated golang12 to go 1.12.17.
  - Add 'apt-get upgrade' to the image builds to include security fixes with each build in case the used base image is not updated frequently.
    In case the base image is updated frequently the 'apt-get upgrade' is a no operation. If not it will catch the security updateds available since the last update of the base image.
  • Loading branch information
falkzoll committed Mar 13, 2020
1 parent 1b8d286 commit aa5c2f5
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 30 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Expand Up @@ -17,6 +17,8 @@
#
-->
# 1.16.0 (next release)
- upgraded to go 1.12.17
- add 'apt-get upgrade' to the image build to get latest security fixes during each build, for the case the base images are not updated frequently
- added OW_WAIT_FOR_ACK such at if true, the proxy waits for an acknowledgement from the action on startup
- added OW_EXECUTION_ENV to validate the execution environment before starting an action
- write compilation logs to standard out
Expand Down
6 changes: 3 additions & 3 deletions golang1.11/CHANGELOG.md
Expand Up @@ -19,6 +19,6 @@

# Go 1.11 OpenWhisk Runtime Container

## Apache 1.13.0-incubating (next release)
- Initial version
- Go 1.11.6
## Apache 1.16 (next release)
Changes:
- Adding Go 1.11.13
25 changes: 12 additions & 13 deletions golang1.11/Dockerfile
Expand Up @@ -15,19 +15,18 @@
# limitations under the License.
#
FROM golang:1.11.13
RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" \
>>/etc/apt/sources.list &&\
apt-get update && apt-get install -y \
curl \
jq \
git &&\
apt-get -y install \
librdkafka1=0.11.6-1~bpo9+1 \
librdkafka++1=0.11.6-1~bpo9+1 && \
apt-get -y install \
librdkafka-dev=0.11.6-1~bpo9+1 && \
rm -rf /var/lib/apt/lists/*
RUN mkdir /action
RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" >>/etc/apt/sources.list \
&& apt-get update \
&& apt-get -y --no-install-recommends upgrade \
&& apt-get -y --no-install-recommends install \
curl jq git \
librdkafka1=0.11.6-1~bpo9+1 \
librdkafka++1=0.11.6-1~bpo9+1 \
librdkafka-dev=0.11.6-1~bpo9+1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir /action

WORKDIR /action
ADD proxy /bin/proxy
ADD gobuild.py /bin/compile
Expand Down
24 changes: 24 additions & 0 deletions golang1.12/CHANGELOG.md
@@ -0,0 +1,24 @@
<!--
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
-->

# Go 1.12 OpenWhisk Runtime Container

## Apache 1.16 (next release)
Changes:
- Adding Go 1.12.17
27 changes: 13 additions & 14 deletions golang1.12/Dockerfile
Expand Up @@ -14,20 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM golang:1.12.9
RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" \
>>/etc/apt/sources.list &&\
apt-get update && apt-get install -y \
curl \
jq \
git &&\
apt-get -y install \
librdkafka1=0.11.6-1~bpo9+1 \
librdkafka++1=0.11.6-1~bpo9+1 && \
apt-get -y install \
librdkafka-dev=0.11.6-1~bpo9+1 && \
rm -rf /var/lib/apt/lists/*
RUN mkdir /action
FROM golang:1.12.17
RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" >>/etc/apt/sources.list \
&& apt-get update \
&& apt-get -y --no-install-recommends upgrade \
&& apt-get -y --no-install-recommends install \
curl jq git \
librdkafka1=0.11.6-1~bpo9+1 \
librdkafka++1=0.11.6-1~bpo9+1 \
librdkafka-dev=0.11.6-1~bpo9+1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir /action

WORKDIR /action
ADD proxy /bin/proxy
ADD gobuild.py /bin/compile
Expand Down

0 comments on commit aa5c2f5

Please sign in to comment.