Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade upstream images to Alpine 3.15 #3041

Merged
merged 3 commits into from
Feb 24, 2022
Merged

Upgrade upstream images to Alpine 3.15 #3041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7408cc3
initial upgrades
tobybellwood Feb 21, 2022
987a218
Merge branch 'main' into alpine_next
tobybellwood Feb 24, 2022
43acec2
update logs-dispatcher too
tobybellwood Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/docker-host/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/kubectl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions images/oc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion local-dev/api-data-watcher-pusher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.14.3
FROM alpine:3.15.0

RUN apk add --no-cache \
bash \
Expand Down
2 changes: 1 addition & 1 deletion local-dev/git/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.14.3
FROM alpine:3.15.0

RUN apk add --no-cache \
bash \
Expand Down
2 changes: 1 addition & 1 deletion services/logs-concentrator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluent/fluentd:v1.13-1
FROM fluent/fluentd:v1.14-1
LABEL maintainer="support@amazee.io"

ARG LAGOON_VERSION
Expand Down
2 changes: 1 addition & 1 deletion services/logs-dispatcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluent/fluentd:v1.12-1
FROM fluent/fluentd:v1.14-1
LABEL maintainer="support@amazee.io"

ARG LAGOON_VERSION
Expand Down
2 changes: 1 addition & 1 deletion services/logs-tee/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.14.3
FROM alpine:3.15.0
LABEL maintainer="support@amazee.io"

ARG LAGOON_VERSION
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down