Skip to content

update docker base images and UI dependencies #1302

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

Merged
merged 4 commits into from
Jan 13, 2021
Merged

update docker base images and UI dependencies #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
141ec51
update docker base images and UI dependencies
FxKu Jan 12, 2021
a4680a9
[UI] update cluster_discovery
FxKu Jan 12, 2021
fbbf47c
go back to k8s 3.0.0
FxKu Jan 12, 2021
0812406
use latest compliant base image
FxKu Jan 12, 2021
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 docker/DebugDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM registry.opensource.zalan.do/library/alpine-3.12:latest
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"

# We need root certificates to deal with teams api over https
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM registry.opensource.zalan.do/library/alpine-3.12:latest
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"

# We need root certificates to deal with teams api over https
Expand Down
2 changes: 1 addition & 1 deletion docker/logical-backup/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM registry.opensource.zalan.do/library/ubuntu-18.04:latest
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand Down
2 changes: 1 addition & 1 deletion ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.6
FROM registry.opensource.zalan.do/library/alpine-3.12:latest
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"

EXPOSE 8081
Expand Down
16 changes: 8 additions & 8 deletions ui/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Flask-OAuthlib==0.9.5
Flask==1.1.2
backoff==1.8.1
boto3==1.10.4
backoff==1.10.0
boto3==1.16.52
boto==2.49.0
click==6.7
furl==1.0.2
gevent==1.2.2
jq==0.1.6
click==7.1.2
furl==2.1.0
gevent==20.12.1
jq==1.1.1
json_delta>=2.0
kubernetes==3.0.0
requests==2.22.0
requests==2.25.1
stups-tokens>=1.1.19
wal_e==1.1.0
wal_e==1.1.1
werkzeug==0.16.1