Skip to content

future: support eks image #363

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
wilhelmguo merged 5 commits into from
Mar 22, 2019
Merged

future: support eks image #363

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35c71ce
future: support eks image
iyacontrol Mar 18, 2019
95f8016
Merge branch 'master' into eks
Mar 22, 2019
51c8f57
future: add aws-iam-authenticator into base image to support eks
iyacontrol Mar 22, 2019
0a0cd43
Merge branch 'master' into eks
iyacontrol Mar 22, 2019
ef26da6
Merge branch 'master' into eks
iyacontrol Mar 22, 2019
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ COPY --from=frontend /workspace/dist/index.html /go/src/github.com/Qihoo360/wayn
RUN cd /go/src/github.com/Qihoo360/wayne/src/backend && bee generate docs && bee pack -o /_build

# build release image
FROM centos:7
FROM 360cloud/centos:7

RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

Expand Down
5 changes: 5 additions & 0 deletions hack/build/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM centos:7

ADD https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator /usr/bin/aws-iam-authenticator

RUN chmod +x /usr/bin/aws-iam-authenticator
⚡