github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

alpine: Use C locale to sort the versions file.

Browse Source 
This should reduce instability due to different people's environment. This
undoes the reordering done by "alpine: Update to containerd v1.0.0-alpha2",
leaving just the hash update (as expected).

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-27 12:14:36 +01:00
parent 88ab788749
commit 886870c935
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/alpine/Makefile
View File

@ -50,7 +50,7 @@ hash: Makefile iid
versions.$(ARCH): Makefile hash iid versions.$(ARCH): Makefile hash iid
echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH) echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH)
docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH) docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | LANG=C sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH)
push: hash iid versions.$(ARCH) push: hash iid versions.$(ARCH)
docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \

8
tools/alpine/versions.x86_64
View File

@ -91,14 +91,14 @@ libattr-2.4.47-r6
libblkid-2.28.2-r2 libblkid-2.28.2-r2
libburn-1.4.6-r0 libburn-1.4.6-r0
libbz2-1.0.6-r5 libbz2-1.0.6-r5
libc-dev-0.7.1-r0
libc-utils-0.7.1-r0
libcap-2.25-r1 libcap-2.25-r1
libcap-ng-0.7.8-r0 libcap-ng-0.7.8-r0
libcap-ng-dev-0.7.8-r0 libcap-ng-dev-0.7.8-r0
libc-dev-0.7.1-r0
libcom_err-1.43.4-r0 libcom_err-1.43.4-r0
libcrypto1.0-1.0.2k-r0 libcrypto1.0-1.0.2k-r0
libcurl-7.54.0-r0 libcurl-7.54.0-r0
libc-utils-0.7.1-r0
libdrm-2.4.80-r0 libdrm-2.4.80-r0
libedit-20170329.3.1-r2 libedit-20170329.3.1-r2
libelf-0.8.13-r2 libelf-0.8.13-r2
@ -131,10 +131,10 @@ libpcap-1.8.1-r0
libpciaccess-0.13.4-r1 libpciaccess-0.13.4-r1
libpng-1.6.29-r1 libpng-1.6.29-r1
libressl-2.5.4-r0 libressl-2.5.4-r0
libressl-dev-2.5.4-r0
libressl2.5-libcrypto-2.5.4-r0 libressl2.5-libcrypto-2.5.4-r0
libressl2.5-libssl-2.5.4-r0 libressl2.5-libssl-2.5.4-r0
libressl2.5-libtls-2.5.4-r0 libressl2.5-libtls-2.5.4-r0
libressl-dev-2.5.4-r0
libsasl-2.1.26-r10 libsasl-2.1.26-r10
libseccomp-2.3.2-r0 libseccomp-2.3.2-r0
libseccomp-dev-2.3.2-r0 libseccomp-dev-2.3.2-r0
@ -175,12 +175,12 @@ ncurses-terminfo-base-6.0-r7
nettle-3.3-r0 nettle-3.3-r0
npth-1.2-r0 npth-1.2-r0
oniguruma-6.2.0-r0 oniguruma-6.2.0-r0
open-vm-tools-10.1.0-r7
openntpd-6.0_p1-r3 openntpd-6.0_p1-r3
openrc-0.24.1-r2 openrc-0.24.1-r2
openssh-keygen-7.5_p1-r1 openssh-keygen-7.5_p1-r1
openssh-server-7.5_p1-r1 openssh-server-7.5_p1-r1
openssl-dev-1.0.2k-r0 openssl-dev-1.0.2k-r0
open-vm-tools-10.1.0-r7
opus-1.1.4-r0 opus-1.1.4-r0
ovmf-0.0.20161115-r1 ovmf-0.0.20161115-r1
p11-kit-0.23.2-r1 p11-kit-0.23.2-r1