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

Prepare Linux UCS2 shard for upgrade to Centos6 base image in #7064 #7418

Merged
merged 16 commits into from
Apr 2, 2019
Merged

Prepare Linux UCS2 shard for upgrade to Centos6 base image in #7064 #7418

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
674dfc1
Make Dockerfile robust
Eric-Arellano Mar 22, 2019
a5ccc56
Change solution: use different PYENV_ROOT
Eric-Arellano Mar 22, 2019
b39d133
Merge branch 'master' of github.com:pantsbuild/pants into robust-ucs2…
Eric-Arellano Apr 2, 2019
9ed7279
Point to specific pyenv/versions bin path
Eric-Arellano Apr 2, 2019
b6d033f
No longer use a custom pyenv_root
Eric-Arellano Apr 2, 2019
afc1ad0
Disambiguate PYTHON_27_VERSION
Eric-Arellano Apr 2, 2019
83dfa61
Check if PYENV_ROOT exists, rather than PYENV_BIN
Eric-Arellano Apr 2, 2019
c8f07c4
Fix PATH entry
Eric-Arellano Apr 2, 2019
2e6cef0
De-duplicate PYENV_PYTHON_27_BIN_FOLDER
Eric-Arellano Apr 2, 2019
35979e8
packages.py checks if it should run PEX or ./pants.
Eric-Arellano Apr 2, 2019
6d8e1d1
Use bin name python2.7 instead of python
Eric-Arellano Apr 2, 2019
35add1b
Temporarily run Linux UCS2 in bootstrap stage
Eric-Arellano Apr 2, 2019
f7800ed
Go back to using pyenv/shims instead of versions
Eric-Arellano Apr 2, 2019
26c2d00
Revert "packages.py checks if it should run PEX or ./pants."
Eric-Arellano Apr 2, 2019
df20fb5
remove setting UCS2 to run in bootstrap stage
Eric-Arellano Apr 2, 2019
b105ee9
Merge branch 'master' of github.com:pantsbuild/pants into robust-ucs2…
Eric-Arellano Apr 2, 2019
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
13 changes: 6 additions & 7 deletions build-support/docker/travis_ci_py27_ucs2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@ FROM pantsbuild/centos6:latest
# interpreter to use when `ci.sh` and `release.sh` set the interpreter constraints for
# Pants, and thus for the built ./pants.pex. We set $PY to the exact Python 2.7 version we want
# to ensure the PEX is bootstrapped with UCS 2.
ARG PYTHON_2_VERSION=2.7.15
ARG PYTHON_27_VERSION_UCS2=2.7.15
# TODO(7064): remove this yum install line once we update the base Centos6 image to include this dependency.
RUN yum install sqlite-devel -y
ENV PYENV_ROOT /pyenv-docker-build
RUN mkdir ${PYENV_ROOT}
RUN git clone https://github.com/pyenv/pyenv ${PYENV_ROOT}
ENV PYENV_ROOT "${PYENV_ROOT:-/pyenv-docker-build}"
ENV PYENV_BIN "${PYENV_ROOT}/bin/pyenv"
RUN if [[ ! -d "${PYENV_ROOT}" ]]; then git clone https://github.com/pyenv/pyenv ${PYENV_ROOT}; fi
ENV PYTHON_CONFIGURE_OPTS --enable-unicode=ucs2
RUN /usr/bin/scl enable devtoolset-7 -- bash -c '\
${PYENV_ROOT}/bin/pyenv install ${PYTHON_2_VERSION} \
&& ${PYENV_ROOT}/bin/pyenv global ${PYTHON_2_VERSION}'
RUN /usr/bin/scl enable devtoolset-7 -- bash -c '${PYENV_BIN} install ${PYTHON_27_VERSION_UCS2}'
RUN /usr/bin/scl enable devtoolset-7 -- bash -c '${PYENV_BIN} global ${PYTHON_27_VERSION_UCS2}'
ENV PATH "${PYENV_ROOT}/shims:${PATH}"
ENV PY "${PYENV_ROOT}/shims/python2.7"
ENV PEX_PYTHON_PATH "${PYENV_ROOT}/shims/python2.7"
Expand Down