Skip to content

Update 3.6 to 3.6.0b3 and refactor update.sh to handle pre-releases in a saner manner #157

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

Merged
merged 1 commit into from
Nov 14, 2016

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 9, 2016

Closes #156

I've intentionally left the PIP update/discussion to #154 (since it's orthogonal to this bump)

@tianon
Copy link
Member Author

tianon commented Nov 9, 2016

$ ./generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/python/blob/b16ff405101a9f6c6540fb3467ca25baa9610174/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <[email protected]> (@tianon),
             Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/python.git

Tags: 2.7.12, 2.7, 2
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 2.7

Tags: 2.7.12-slim, 2.7-slim, 2-slim
GitCommit: 6b24d8cd0ad4c5a01874d094d92cd79518b3d490
Directory: 2.7/slim

Tags: 2.7.12-alpine, 2.7-alpine, 2-alpine
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 2.7/alpine

Tags: 2.7.12-wheezy, 2.7-wheezy, 2-wheezy
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 2.7/wheezy

Tags: 2.7.12-onbuild, 2.7-onbuild, 2-onbuild
GitCommit: 7663560df7547e69d13b1b548675502f4e0917d1
Directory: 2.7/onbuild

Tags: 2.7.12-windowsservercore, 2.7-windowsservercore, 2-windowsservercore
GitCommit: 1ad743decae71db424840812eb8dd49557aed9d0
Directory: 2.7/windows/windowsservercore
Constraints: windowsservercore

Tags: 3.3.6, 3.3
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.3

Tags: 3.3.6-slim, 3.3-slim
GitCommit: 6b24d8cd0ad4c5a01874d094d92cd79518b3d490
Directory: 3.3/slim

Tags: 3.3.6-alpine, 3.3-alpine
GitCommit: 83b8e044aa38ab97b5427a9591e0537464e976e6
Directory: 3.3/alpine

Tags: 3.3.6-wheezy, 3.3-wheezy
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.3/wheezy

Tags: 3.3.6-onbuild, 3.3-onbuild
GitCommit: 9a9021f2134d953165b31d98cacb95aa34076f90
Directory: 3.3/onbuild

Tags: 3.4.5, 3.4
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.4

Tags: 3.4.5-slim, 3.4-slim
GitCommit: 6b24d8cd0ad4c5a01874d094d92cd79518b3d490
Directory: 3.4/slim

Tags: 3.4.5-alpine, 3.4-alpine
GitCommit: 83b8e044aa38ab97b5427a9591e0537464e976e6
Directory: 3.4/alpine

Tags: 3.4.5-wheezy, 3.4-wheezy
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.4/wheezy

Tags: 3.4.5-onbuild, 3.4-onbuild
GitCommit: 9a9021f2134d953165b31d98cacb95aa34076f90
Directory: 3.4/onbuild

Tags: 3.5.2, 3.5, 3, latest
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.5

Tags: 3.5.2-slim, 3.5-slim, 3-slim, slim
GitCommit: 6b24d8cd0ad4c5a01874d094d92cd79518b3d490
Directory: 3.5/slim

Tags: 3.5.2-alpine, 3.5-alpine, 3-alpine, alpine
GitCommit: 83b8e044aa38ab97b5427a9591e0537464e976e6
Directory: 3.5/alpine

Tags: 3.5.2-onbuild, 3.5-onbuild, 3-onbuild, onbuild
GitCommit: 9a9021f2134d953165b31d98cacb95aa34076f90
Directory: 3.5/onbuild

Tags: 3.5.2-windowsservercore, 3.5-windowsservercore, 3-windowsservercore, windowsservercore
GitCommit: 855b85c8309e925814dfa97d61310080dcd08db6
Directory: 3.5/windows/windowsservercore
Constraints: windowsservercore

Tags: 3.6.0b3, 3.6-rc, rc
GitCommit: b16ff405101a9f6c6540fb3467ca25baa9610174
Directory: 3.6-rc

Tags: 3.6.0b3-slim, 3.6-rc-slim, rc-slim
GitCommit: b16ff405101a9f6c6540fb3467ca25baa9610174
Directory: 3.6-rc/slim

Tags: 3.6.0b3-alpine, 3.6-rc-alpine, rc-alpine
GitCommit: b16ff405101a9f6c6540fb3467ca25baa9610174
Directory: 3.6-rc/alpine

Tags: 3.6.0b3-onbuild, 3.6-rc-onbuild, rc-onbuild
GitCommit: b16ff405101a9f6c6540fb3467ca25baa9610174
Directory: 3.6-rc/onbuild

Tags: 3.6.0b3-windowsservercore, 3.6-rc-windowsservercore, rc-windowsservercore
GitCommit: b16ff405101a9f6c6540fb3467ca25baa9610174
Directory: 3.6-rc/windows/windowsservercore
Constraints: windowsservercore
$ ./update.sh
+ sed -ri -e 's/^(ENV GPG_KEY) .*/\1 C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF/' -e 's/^(ENV PYTHON_VERSION) .*/\1 2.7.12/' -e 's/^(ENV PYTHON_RELEASE) .*/\1 2.7.12/' -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 8.1.2/' -e 's/^(FROM python):.*/\1:2.7/' 2.7/Dockerfile 2.7/alpine/Dockerfile 2.7/onbuild/Dockerfile 2.7/slim/Dockerfile 2.7/wheezy/Dockerfile 2.7/windows/windowsservercore/Dockerfile
+ sed -ri -e 's/^(ENV GPG_KEY) .*/\1 26DEA9D4613391EF3E25C9FF0A5B101836580288/' -e 's/^(ENV PYTHON_VERSION) .*/\1 3.3.6/' -e 's/^(ENV PYTHON_RELEASE) .*/\1 3.3.6/' -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 8.1.2/' -e 's/^(FROM python):.*/\1:3.3/' 3.3/Dockerfile 3.3/alpine/Dockerfile 3.3/onbuild/Dockerfile 3.3/slim/Dockerfile 3.3/wheezy/Dockerfile
+ sed -ri -e 's/^(ENV GPG_KEY) .*/\1 97FC712E4C024BBEA48A61ED3A5CA953F73C700D/' -e 's/^(ENV PYTHON_VERSION) .*/\1 3.4.5/' -e 's/^(ENV PYTHON_RELEASE) .*/\1 3.4.5/' -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 8.1.2/' -e 's/^(FROM python):.*/\1:3.4/' 3.4/Dockerfile 3.4/alpine/Dockerfile 3.4/onbuild/Dockerfile 3.4/slim/Dockerfile 3.4/wheezy/Dockerfile
+ sed -ri -e 's/^(ENV GPG_KEY) .*/\1 97FC712E4C024BBEA48A61ED3A5CA953F73C700D/' -e 's/^(ENV PYTHON_VERSION) .*/\1 3.5.2/' -e 's/^(ENV PYTHON_RELEASE) .*/\1 3.5.2/' -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 8.1.2/' -e 's/^(FROM python):.*/\1:3.5/' 3.5/Dockerfile 3.5/alpine/Dockerfile 3.5/onbuild/Dockerfile 3.5/slim/Dockerfile 3.5/windows/windowsservercore/Dockerfile
+ sed -ri -e 's/^(ENV GPG_KEY) .*/\1 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D/' -e 's/^(ENV PYTHON_VERSION) .*/\1 3.6.0b3/' -e 's/^(ENV PYTHON_RELEASE) .*/\1 3.6.0/' -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 8.1.2/' -e 's/^(FROM python):.*/\1:3.6-rc/' 3.6-rc/Dockerfile 3.6-rc/alpine/Dockerfile 3.6-rc/onbuild/Dockerfile 3.6-rc/slim/Dockerfile 3.6-rc/windows/windowsservercore/Dockerfile

(output reflects my temporary hard-coded pipVersion='8.1.2' to avoid changing PIP version here)

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

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

But I think we should merge the pip update first since the folder renames may cause conflicts.

@michael-k
Copy link
Contributor

the folder renames may cause conflicts

Not an argument; I know how to use rebase ;)

@yosifkit yosifkit merged commit 7feaf24 into docker-library:master Nov 14, 2016
@yosifkit yosifkit deleted the better-rcs branch November 14, 2016 20:19
tianon added a commit to infosiftr/stackbrew that referenced this pull request Nov 17, 2016
- `cassandra`: 3.0.10
- `docker`: 1.13.0-rc1 (currently failing the `override-cmd` test; see moby/moby#28329), `docker daemon` -> `dockerd` (docker-library/docker#31)
- `drupal`: 8.2.3
- `java`: alpine 7.121.2.6.8-r0, 8.111.14-r0
- `openjdk`: alpine 7.121.2.6.8-r0, 8.111.14-r0
- `python`: 3.6.0b3 (docker-library/python#157), pip 9.0.1 (docker-library/python#154)
- `ruby`: 2.3.2, 2.2.6
- `tomcat`: 6.0.48, 7.0.73, 8.0.39, 8.5.8, 9.0.0.M13
- `wordpress`: add `WORDPRESS_*_FILE` support for passing parameters via files especially for [Docker secrets](moby/moby#27794) (docker-library/wordpress#186)
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.

3 participants