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 0dbbe1f Automatically include go1.15.x and go1.16.x updates. (#154)
0dbbe1f is described below
commit 0dbbe1fb681cafe5dd5575f4c49521532c7d5829
Author: falkzoll <[email protected]>
AuthorDate: Mon Sep 6 11:11:28 2021 +0200
Automatically include go1.15.x and go1.16.x updates. (#154)
- Relax the builds of the go1.15 and go1.16 runtimes to automatically use
the latest go patch level instead of using fixed ones.
This allows to automatically include the latest securtity fixes for these
runtimes. Up to now this always required a change and therefore a PR to be
processed.
Relaxing this allows these runtimes to automatically stay actual without
furhter effort.
---
.travis.yml | 2 +-
golang1.15/Dockerfile | 5 ++++-
golang1.16/Dockerfile | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ca92f2e..8d7ab58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@
sudo: required
language: go
go:
- - "1.16.6"
+ - "1.16.x" # Do not fix the patch level to automatically get security
fixes.
services:
- docker
diff --git a/golang1.15/Dockerfile b/golang1.15/Dockerfile
index be2a525..e3d9c1d 100644
--- a/golang1.15/Dockerfile
+++ b/golang1.15/Dockerfile
@@ -14,7 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM golang:1.15.14
+
+# Do not fix the patch level for golang:1.15 to automatically get security
fixes.
+FROM golang:1.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 &&\
diff --git a/golang1.16/Dockerfile b/golang1.16/Dockerfile
index aef76e1..310d790 100644
--- a/golang1.16/Dockerfile
+++ b/golang1.16/Dockerfile
@@ -14,7 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM golang:1.16.6
+
+# Do not fix the patch level for golang:1.16 to automatically get security
fixes.
+FROM golang:1.16-buster
+
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 &&\
