Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

make python 3 work in the docker container #3911

Merged
merged 4 commits into from
Sep 25, 2018

Conversation

jcgruenhage
Copy link
Contributor

No description provided.

@jcgruenhage jcgruenhage requested a review from a team September 20, 2018 11:16
@jcgruenhage jcgruenhage force-pushed the jcgruenhage/docker-support-python3 branch from 30488bd to 3af7a95 Compare September 20, 2018 12:55
@jcgruenhage jcgruenhage changed the base branch from release-v0.33.5 to develop September 20, 2018 12:55
@@ -12,6 +13,7 @@ RUN apk add --no-cache --virtual .build_deps \
postgresql-dev \
zlib-dev \
&& cd /synapse \
&& sed -i 's/\["synctl"\] + //' setup.py \
Copy link
Member

Choose a reason for hiding this comment

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

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
Copy link
Contributor Author

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

@richvdh richvdh merged commit f651636 into develop Sep 25, 2018
@jcgruenhage jcgruenhage deleted the jcgruenhage/docker-support-python3 branch September 28, 2018 11:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants