diff --git a/dockerfile-rootfs32 b/dockerfile-rootfs32 index d30e53b..b47b93c 100644 --- a/dockerfile-rootfs32 +++ b/dockerfile-rootfs32 @@ -1,5 +1,3 @@ -# We're using a multistage Docker build here in order to allow us to release a self-verifying - FROM slitazcn/slitaz-5.0-base COPY ./iso-old32/boot/rootfs.gz ./packages/* ./ RUN mkdir -p /tmp/rootfs && \ diff --git a/dockerfile-rootfs64 b/dockerfile-rootfs64 index d3c73b0..5cea800 100644 --- a/dockerfile-rootfs64 +++ b/dockerfile-rootfs64 @@ -1,14 +1,3 @@ -# We're using a multistage Docker build here in order to allow us to release a self-verifying -# Docker image when built on the official Docker infrastructure. -# They require us to verify the source integrity in some way while making sure that this is a -# reproducible build. -# See https://github.com/docker-library/official-images#image-build -# In order to achieve this, we externally host the rootfs archives and their checksums and then -# just download and verify it in the first stage of this Dockerfile. -# The second stage is for actually configuring the system a little bit. -# Some templating is done in order to allow us to easily build different configurations and to -# allow us to automate the releaes process.tazpkg install ghost-5.0.1.tazpkg --root=$ISO_PATH/rootfs --nodeps --local - FROM slitazcn/slitaz-5.0-base COPY ./iso-old/boot/rootfs.gz ./packages/* ./ RUN mkdir -p /tmp/rootfs && \ diff --git a/mk-slitaz64.sh b/mk-slitaz64.sh index d62774a..ba4620e 100644 --- a/mk-slitaz64.sh +++ b/mk-slitaz64.sh @@ -46,9 +46,9 @@ echo $fast_mirror [ ! -e slitaz-rolling-core64.iso ] && wget $fast_mirror/iso/rolling/slitaz-rolling-core64.iso mkdir iso-old [ ! -d iso-old/boot ] && 7z x slitaz-rolling-core64.iso -y -r -o./iso-old -[ ! -e packages/linux64-3.16.55.tazpkg ] && wget -O ./packages/linux64-3.16.55.tazpkg http://ecoo.top:8083/dl/slitaz/linux64-3.16.55.tazpkg -[ ! -e packages/teasiu-5.0.tazpkg ] && wget -O ./packages/teasiu-5.0.tazpkg http://ecoo.top:8083/dl/slitaz/teasiu-5.0.tazpkg -[ ! -e packages/updatetime.txt ] && wget -O ./packages/updatetime.txt http://ecoo.top:8083/dl/slitaz/iso/rolling/slitaz-rolling-core64-chinese-updatetime.txt +[ ! -e packages/linux64-3.16.55.tazpkg ] && wget -O ./packages/linux64-3.16.55.tazpkg http://www.ecoo.top:8083/dl/slitaz/linux64-3.16.55.tazpkg +[ ! -e packages/teasiu-5.0.tazpkg ] && wget -O ./packages/teasiu-5.0.tazpkg http://www.ecoo.top:8083/dl/slitaz/teasiu-5.0.tazpkg +[ ! -e packages/updatetime.txt ] && wget -O ./packages/updatetime.txt http://www.ecoo.top:8083/dl/slitaz/iso/rolling/slitaz-rolling-core64-chinese-updatetime.txt docker build -t newrootfs -f ./dockerfile-rootfs64 . docker run --name myrootfs newrootfs docker cp myrootfs:/tmp/rootfs-new.gz ./iso64/mkiso/rootfs.gz diff --git a/packages/gen-slitaz32.sh b/packages/gen-slitaz32.sh index 82d6075..f99b379 100644 --- a/packages/gen-slitaz32.sh +++ b/packages/gen-slitaz32.sh @@ -1,7 +1,5 @@ #!/bin/sh -URL="http://ecoo.top:8083/dl/slitaz" ROOTFS="/tmp/rootfs" -echo "$URL/packages/5.0/" > $ROOTFS/var/lib/tazpkg/mirror tazpkg install yong-2.5.0.tazpkg --root=$ROOTFS --nodeps --local tazpkg install sudocn-1.8.4.tazpkg --root=$ROOTFS --nodeps --local tazpkg install ghost-5.0.1.tazpkg --root=$ROOTFS --nodeps --local diff --git a/packages/gen-slitaz64.sh b/packages/gen-slitaz64.sh index 1bb3ba2..ec72a1b 100644 --- a/packages/gen-slitaz64.sh +++ b/packages/gen-slitaz64.sh @@ -1,7 +1,5 @@ #!/bin/sh -URL="http://ecoo.top:8083/dl/slitaz" ROOTFS="/tmp/rootfs" -echo "$URL/packages/5.0/" > $ROOTFS/var/lib/tazpkg/mirror tazpkg install linux64-3.16.55.tazpkg --root=$ROOTFS --nodeps --local --forced tazpkg install yong-2.5.0.tazpkg --root=$ROOTFS --nodeps --local tazpkg install sudocn-1.8.4.tazpkg --root=$ROOTFS --nodeps --local diff --git a/packages/mirrors.list b/packages/mirrors.list index e6b3d1b..b432e0d 100644 --- a/packages/mirrors.list +++ b/packages/mirrors.list @@ -20,4 +20,4 @@ http://mirror.math.princeton.edu/pub/slitaz http://dl.aurorafoss.org/slitaz http://www.ecoo.top:8083/dl/slitaz ftp://ftp.rz.uni-kiel.de/pub2/linux/slitaz -http://192.168.111.4/dl/slitaz +http://192.168.111.4:8083/dl/slitaz