Update download URL to be correct

Author: tianon

Dockerfile

@@ -37,9 +37,10 @@ VOLUME /var/www/html
 WORKDIR /var/www/html
 
 ENV WORDPRESS_VERSION 4.0.0
+ENV WORDPRESS_UPSTREAM_VERSION 4.0
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
-RUN curl -SL http://wordpress.org/wordpress-$WORDPRESS_VERSION.tar.gz | tar -xzC /usr/src/
+RUN curl -SL http://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz | tar -xzC /usr/src/
 
 COPY docker-apache.conf /etc/apache2/sites-available/wordpress
 RUN a2dissite 000-default && a2ensite wordpress

update.sh

@@ -3,10 +3,14 @@ set -e
 
 current="$(curl -sSL 'http://api.wordpress.org/core/version-check/1.7/' | sed -r 's/^.*"current":"([^"]+)".*$/\1/')"
 
+upstream="$current"
 if [[ "$current" != *.*.* ]]; then
 	# turn "4.0" into "4.0.0"
 	current+='.0'
 fi
 
 set -x
-sed -ri 's/^(ENV WORDPRESS_VERSION) .*/\1 '"$current"'/' Dockerfile
+sed -ri '
+	s/^(ENV WORDPRESS_VERSION) .*/\1 '"$current"'/;
+	s/^(ENV WORDPRESS_UPSTREAM_VERSION) .*/\1 '"$upstream"'/;
+' Dockerfile