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

Upgrade to Tls >= 0.9.0 and Cohttp-lwt-unix >= 1.0.0 #615

Merged
merged 5 commits into from
Jan 23, 2018

Conversation

kit-ty-kate
Copy link
Contributor

@talex5
Copy link
Contributor

talex5 commented Jan 22, 2018

CI failed with:

The following dependencies couldn't be met:
  - datakit-ci -> cohttp-lwt-unix >= 1.0.0
    no matching version

Maybe the Dockerfile FROM lines need updating?

@kit-ty-kate
Copy link
Contributor Author

Yes probably.
Why is there this reset on 68b69980 in git -C /home/opam/opam-repository reset 68b69980 --hard ?

@kit-ty-kate
Copy link
Contributor Author

Ok I got the answer to my own question.
Fixed.

@samoht
Copy link
Member

samoht commented Jan 22, 2018

You also need to change the FROM lines to use the opam2 images, e.g. something like:

diff --git a/Dockerfile b/Dockerfile
index 9833eaf..dd07d34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,10 @@
-FROM ocaml/opam-dev:alpine-3.5_ocaml-4.05.0
+FROM ocaml/opam2:alpine-3.6-ocaml-4.06.0@sha256:b93bd58dd2d32f0b7a6cd85fe2580ebee7452ef0174904b6a6b0a137c25f6d1b
 RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4

The opam-dev images are not maintained by @avsm anymore.

@kit-ty-kate
Copy link
Contributor Author

All green !!

@samoht The opam2 image(s ?) still fails to parse some packages so I'd let that as it is for now.

@samoht
Copy link
Member

samoht commented Jan 23, 2018

LGTM. Thanks for the patches!

@samoht samoht merged commit a6fedef into moby:master Jan 23, 2018
@kit-ty-kate kit-ty-kate deleted the upgrade-tls-cohttp branch January 23, 2018 18:22
@kit-ty-kate
Copy link
Contributor Author

Thanks !! Is there a release planned soon by any chance ? :3

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.

None yet

3 participants