Sort packages; fix update.sh for 1.5

Author: yosifkit

1.5/Dockerfile

@@ -20,9 +20,9 @@ RUN set -x \
 		libc6-dev \
 		libpcre3-dev \
 		libssl-dev \
-		zlib1g-dev \
 		make \
 		wget \
+		zlib1g-dev \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

1.6/Dockerfile

@@ -22,9 +22,9 @@ RUN set -x \
 		liblua5.3-dev \
 		libpcre3-dev \
 		libssl-dev \
-		zlib1g-dev \
 		make \
 		wget \
+		zlib1g-dev \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

1.7/Dockerfile

@@ -22,9 +22,9 @@ RUN set -x \
 		liblua5.3-dev \
 		libpcre3-dev \
 		libssl-dev \
-		zlib1g-dev \
 		make \
 		wget \
+		zlib1g-dev \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

1.8/Dockerfile

@@ -22,9 +22,9 @@ RUN set -x \
 		liblua5.3-dev \
 		libpcre3-dev \
 		libssl-dev \
-		zlib1g-dev \
 		make \
 		wget \
+		zlib1g-dev \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

Dockerfile-debian.template

@@ -22,9 +22,9 @@ RUN set -x \
 		liblua5.3-dev \
 		libpcre3-dev \
 		libssl-dev \
-		zlib1g-dev \
 		make \
 		wget \
+		zlib1g-dev \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

update.sh

@@ -45,6 +45,13 @@ for version in "${versions[@]}"; do
 			s/%%HAPROXY_VERSION%%/'"$fullVersion"'/;
 			s/%%HAPROXY_MD5%%/'"$md5"'/;
 		'
+	
+	if [ "$version" = '1.5' ]; then
+		sedExpr+='
+			/lua/d;
+			s/libssl1.1/libssl1.0.0/;
+		'
+	fi
 	( set -x; sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile" )
 
 	for variant in alpine; do
@@ -53,11 +60,6 @@ for version in "${versions[@]}"; do
 		travisEnv='\n  - VERSION='"$version VARIANT=$variant$travisEnv"
 	done
 
-	if [ "$version" = '1.5' ]; then
-		for dockerfile in "$version/Dockerfile" "$version/$variant/Dockerfile"; do
-			sed -ri -e '/lua/d' -e 's/libssl1.1/libssl1.0.0/' "$dockerfile"
-		done
-	fi
 
 	travisEnv='\n  - VERSION='"$version ARCH=i386$travisEnv"
 	travisEnv='\n  - VERSION='"$version VARIANT=$travisEnv"