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

chore: do not login to DockerHub #11358

Merged
merged 39 commits into from
Nov 10, 2020
Merged

chore: do not login to DockerHub #11358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
061a2a3
remove dockerhub stuff
iliapolo Nov 5, 2020
4c7be79
added necessary aws env
iliapolo Nov 5, 2020
b2274ce
debug
iliapolo Nov 5, 2020
c5b1e5e
dont actually build for now
iliapolo Nov 5, 2020
dc95e26
debug
iliapolo Nov 5, 2020
837a72a
dummy
iliapolo Nov 6, 2020
7d764bb
build
iliapolo Nov 6, 2020
24889c2
test
iliapolo Nov 6, 2020
dfefb33
ecr testing
iliapolo Nov 6, 2020
effdd8a
Merge branch 'master' into epolon-dockerhub
iliapolo Nov 6, 2020
3c3b56b
debug
iliapolo Nov 6, 2020
15afca3
omg
iliapolo Nov 7, 2020
801f0ff
oops
iliapolo Nov 7, 2020
9f3f5bc
fix
iliapolo Nov 7, 2020
4b8b7e9
fix 2
iliapolo Nov 7, 2020
480b5c2
mirror proxy
iliapolo Nov 7, 2020
a9fe009
fix mirror
iliapolo Nov 7, 2020
679748c
wait for nginx and fix argument
iliapolo Nov 7, 2020
4cdb776
again
iliapolo Nov 7, 2020
e8eefc4
test pull doesn't work
iliapolo Nov 7, 2020
c8e88b9
build
iliapolo Nov 7, 2020
44e2d32
fixes and docs
iliapolo Nov 7, 2020
9fb4b38
more fixes
iliapolo Nov 7, 2020
0b4f25b
revert readme
iliapolo Nov 7, 2020
2160603
refactor
iliapolo Nov 8, 2020
7828d85
simpler buildspec
iliapolo Nov 9, 2020
e2f689f
start proxy
iliapolo Nov 9, 2020
5f49b8c
debug
iliapolo Nov 9, 2020
b6147d4
build spec
iliapolo Nov 9, 2020
6f55cd7
get rid of ecr scripts
iliapolo Nov 9, 2020
9d74349
debug
iliapolo Nov 10, 2020
c825e9c
debug 2
iliapolo Nov 10, 2020
441e8a3
try build
iliapolo Nov 10, 2020
7d9270f
testing
iliapolo Nov 10, 2020
b7f4c2e
for real
iliapolo Nov 10, 2020
033dda1
remove comments
iliapolo Nov 10, 2020
52bedb3
Merge branch 'master' into epolon-dockerhub
iliapolo Nov 10, 2020
c03978a
added comment about docker daemon
iliapolo Nov 10, 2020
f5b4981
Merge branch 'epolon-dockerhub' of github.com:aws/aws-cdk into epolon…
iliapolo Nov 10, 2020
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
9 changes: 4 additions & 5 deletions buildspec-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ version: 0.2
phases:
install:
commands:
# Start docker daemon inside the container
- nohup /usr/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
Comment on lines -9 to -10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't these still needed to start the docker daemon?

Copy link
Contributor Author

@iliapolo iliapolo Nov 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eladb We decided to move this into the ecr proxy image as well - so no. the start.sh script takes care of it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a comment and maybe later we can think about renaming/exposing another script to make it more clear.

# login to DockerHub to avoid throttling
- docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn
Expand Down
9 changes: 4 additions & 5 deletions buildspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ version: 0.2
phases:
install:
commands:
# Start docker daemon inside the container
- nohup /usr/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
# login to DockerHub to avoid throttling
- docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn
Expand Down