Merge pull request docker-library#17 from infosiftr/fix-update

yosifkit · yosifkit · commit 992ab4a43f31 · 2014-10-03T14:57:18.000-06:00
Fix update.sh to not mistakenly capture RCs (and thus push 3.4 down to 3.4.1, since 3.4.2 isn't actually out yet)
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /usr/src/python
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
 
-ENV PYTHON_VERSION 3.4.2
+ENV PYTHON_VERSION 3.4.1
 
 RUN curl -SL "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz" \
 		| tar -xJ --strip-components=1
diff --git a/3.4/onbuild/Dockerfile b/3.4/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.4.2
+FROM python:3.4.1
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/update.sh b/update.sh
@@ -10,7 +10,9 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-	fullVersion="$(curl -sSL 'https://www.python.org/ftp/python/' | grep '<a href="'"$version." | sed -r 's!.*<a href="([^"/]+)/?".*!\1!' | sort -V | tail -1)"
+	# <span class="release-number"><a href="/downloads/release/python-278/">Python 2.7.8</a></span>
+	# <span class="release-number"><a href="/downloads/release/python-341/">Python 3.4.1</a></span>
+	fullVersion="$(curl -sSL 'https://www.python.org/downloads/' | awk -F 'Python |</a>' '/<span class="release-number"><a[^>]+>Python '"$version"'./ { print $2 }' | sort -V | tail -1)"
 	(
 		set -x
 		sed -ri 's/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile"
