Merge pull request #3041 from uselagoon/alpine_next

uselagoon · Feb 24, 2022 · 9f9c6cb · 9f9c6cb
2 parents a4f8a99 + 43acec2
commit 9f9c6cb
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/images/docker-host/Dockerfile b/images/docker-host/Dockerfile
@@ -1,7 +1,7 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
 FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons
-FROM docker:20.10.11-dind
+FROM docker:20.10.12-dind
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=docker-host

diff --git a/images/kubectl/Dockerfile b/images/kubectl/Dockerfile
@@ -1,12 +1,12 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
 FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons
-FROM golang:1.16-alpine3.13 as golang
+FROM golang:1.16-alpine3.15 as golang
 
 RUN apk add --no-cache git
 RUN go get github.com/a8m/envsubst/cmd/envsubst
 
-FROM docker:20.10.11
+FROM docker:20.10.12
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=oc

diff --git a/images/oc/Dockerfile b/images/oc/Dockerfile
@@ -1,12 +1,12 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
 FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons
-FROM golang:1.16-alpine3.14 as golang
+FROM golang:1.16-alpine3.15 as golang
 
 RUN apk add --no-cache git
 RUN go get github.com/a8m/envsubst/cmd/envsubst
 
-FROM docker:20.10.11
+FROM docker:20.10.12
 
 LABEL maintainer="amazee.io"
 ENV LAGOON=oc

diff --git a/local-dev/api-data-watcher-pusher/Dockerfile b/local-dev/api-data-watcher-pusher/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14.3
+FROM alpine:3.15.0
 
 RUN apk add --no-cache \
       bash \

diff --git a/local-dev/git/Dockerfile b/local-dev/git/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14.3
+FROM alpine:3.15.0
 
 RUN apk add --no-cache \
       bash \

diff --git a/services/logs-concentrator/Dockerfile b/services/logs-concentrator/Dockerfile
@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.13-1
+FROM fluent/fluentd:v1.14-1
 LABEL maintainer="support@amazee.io"
 
 ARG LAGOON_VERSION

diff --git a/services/logs-dispatcher/Dockerfile b/services/logs-dispatcher/Dockerfile
@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.12-1
+FROM fluent/fluentd:v1.14-1
 LABEL maintainer="support@amazee.io"
 
 ARG LAGOON_VERSION

diff --git a/services/logs-tee/Dockerfile b/services/logs-tee/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14.3
+FROM alpine:3.15.0
 LABEL maintainer="support@amazee.io"
 
 ARG LAGOON_VERSION

diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,6 +1,6 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
-FROM ${UPSTREAM_REPO:-uselagoon}/python-3.8:${UPSTREAM_TAG:-latest}
+FROM ${UPSTREAM_REPO:-uselagoon}/python-3.9:${UPSTREAM_TAG:-latest}
 
 RUN apk add --no-cache \
       bash \