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

make python 3 work in the docker container #3911

Merged
merged 4 commits into from Sep 25, 2018

Conversation

Projects
None yet
2 participants
@jcgruenhage
Member

jcgruenhage commented Sep 19, 2018

No description provided.

@jcgruenhage jcgruenhage requested a review from matrix-org/synapse-core Sep 20, 2018

@jcgruenhage jcgruenhage changed the base branch from release-v0.33.5 to develop Sep 20, 2018

@@ -12,6 +13,7 @@ RUN apk add --no-cache --virtual .build_deps \
postgresql-dev \
zlib-dev \
&& cd /synapse \
&& sed -i 's/\["synctl"\] + //' setup.py \

This comment has been minimized.

@richvdh

richvdh Sep 25, 2018

Member

this should be redundant now due to #3948, and I'm a bit concerned it is rather fragile (we'll get a surprise down the line if we ever change that line in setup.py). Can we remove it?

(if you want to exclude synctl from the final image, do it in the rm below?)

jcgruenhage added some commits Sep 25, 2018

@jcgruenhage

This comment has been minimized.

Member

jcgruenhage commented Sep 25, 2018

I haven't tested this yet, with #3948 it should be good now

@richvdh richvdh merged commit f651636 into develop Sep 25, 2018

6 of 10 checks passed

ci/circleci: sytestpy2 Your tests failed on CircleCI
Details
ci/circleci: sytestpy2postgres Your tests failed on CircleCI
Details
ci/circleci: sytestpy3 Your tests failed on CircleCI
Details
ci/circleci: sytestpy3postgres Your tests failed on CircleCI
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@jcgruenhage jcgruenhage deleted the jcgruenhage/docker-support-python3 branch Sep 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment