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.

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

docker: update to 19.03.15 #1333

Merged
merged 1 commit into from
Feb 20, 2021
Merged

docker: update to 19.03.15 #1333

merged 1 commit into from
Feb 20, 2021

Conversation

webern
Copy link
Contributor

@webern webern commented Feb 19, 2021

Issue number:

Closes #1305

Description of changes:

Update docker to 19.03.15

Testing done:

Ran an ECS task on x86 and on arm, it worked!

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

Should we update docker-init's version to match as well? (It's just intended to match, it doesn't reflect upstream.)

@webern
Copy link
Contributor Author

webern commented Feb 19, 2021

Should we update docker-init's version to match as well? (It's just intended to match, it doesn't reflect upstream.)

You mean in docker-init.spec? I don't know what it means. Should we?

@tjkirch
Copy link
Contributor

tjkirch commented Feb 19, 2021

You mean in docker-init.spec? I don't know what it means. Should we?

We should, yeah. We don't version that package to match upstream tini (which is 0.19.0), we have it match our Docker packaging, since we sort of "repackage" it as docker-init.

@webern
Copy link
Contributor Author

webern commented Feb 19, 2021

You mean in docker-init.spec? I don't know what it means. Should we?

We should, yeah. We don't version that package to match upstream tini (which is 0.19.0), we have it match our Docker packaging, since we sort of "repackage" it as docker-init.

I see that version string in docker-proxy as well. Should I change it there as well?

@tjkirch
Copy link
Contributor

tjkirch commented Feb 19, 2021

I see that version string in docker-proxy as well. Should I change it there as well?

Ah, good catch, I always forget about proxy. If you look in the spec file there, we also have to check that the libnetwork commit hasn't changed, but it looks like we're still good there, so yeah, just updating the version number to match Docker.

@webern
Copy link
Contributor Author

webern commented Feb 19, 2021

webern force-pushed the webern:docker branch from 4a6abf3 to 57d721f

Bump version in docker-init and docker-proxy

@bcressey bcressey merged commit 70257dd into bottlerocket-os:develop Feb 20, 2021
@webern webern deleted the docker branch February 20, 2021 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update to Docker 19.03.15
4 participants