diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..6b733ef --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: tatsushid \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..fe89e52 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +# Set update schedule for GitHub Actions + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..ee35b39 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,37 @@ +name: docker-tinycore + +on: + push: + branches: + - 'main' + - 'master' + - 'dev' + paths-ignore: + - '**/README.md' + pull_request: + branches: + - '*' + schedule: + - cron: "0 0 * */1 *" # At 00:00 in every month. + workflow_dispatch: + +jobs: + image: + name: docker-tinycore + runs-on: ubuntu-20.04 + steps: + - name: "๐Ÿ“ฅ Checkout Code" + uses: actions/checkout@v2.3.4 + with: + submodules: 'recursive' + fetch-depth: 0 + - name: "๐Ÿ› ๏ธ Build" + run: make all +# - name: "Logging to docker" +# run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} +# - name: "๐Ÿ“ค Upload to hub.docker.com" +# run: docker push tinycore --all-tags + - name: "๐Ÿงน Clean" + run: make clean + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..335ec95 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.tar.gz diff --git a/10.0/x86/rootfs.tar.gz b/10.0/x86/rootfs.tar.gz deleted file mode 100644 index 2ecfef4..0000000 Binary files a/10.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/10.0/x86/squashfs-tools.tar.gz b/10.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index 02db619..0000000 Binary files a/10.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/10.0/x86/src/Dockerfile b/10.0/x86/src/Dockerfile index f669e39..8d4006c 100644 --- a/10.0/x86/src/Dockerfile +++ b/10.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/10.x/x86/archive/10.0/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/10.0/x86_64/rootfs64.tar.gz b/10.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index d6a6e72..0000000 Binary files a/10.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/10.0/x86_64/squashfs-tools.tar.gz b/10.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index aa7eea2..0000000 Binary files a/10.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/10.0/x86_64/src/Dockerfile b/10.0/x86_64/src/Dockerfile index 3cbb564..0fe3db8 100644 --- a/10.0/x86_64/src/Dockerfile +++ b/10.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/10.x/x86_64/archive/10.0/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/10.1/x86/rootfs.tar.gz b/10.1/x86/rootfs.tar.gz deleted file mode 100644 index 796c800..0000000 Binary files a/10.1/x86/rootfs.tar.gz and /dev/null differ diff --git a/10.1/x86/squashfs-tools.tar.gz b/10.1/x86/squashfs-tools.tar.gz deleted file mode 100644 index c55c915..0000000 Binary files a/10.1/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/10.1/x86/src/Dockerfile b/10.1/x86/src/Dockerfile index 6e96aae..4bf14a4 100644 --- a/10.1/x86/src/Dockerfile +++ b/10.1/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/10.x/x86/release/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/10.1/x86_64/rootfs64.tar.gz b/10.1/x86_64/rootfs64.tar.gz deleted file mode 100644 index 7828b21..0000000 Binary files a/10.1/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/10.1/x86_64/squashfs-tools.tar.gz b/10.1/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 6006485..0000000 Binary files a/10.1/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/10.1/x86_64/src/Dockerfile b/10.1/x86_64/src/Dockerfile index 7a89bf0..84e70c6 100644 --- a/10.1/x86_64/src/Dockerfile +++ b/10.1/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/10.x/x86_64/release/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/11.0/x86/rootfs.tar.gz b/11.0/x86/rootfs.tar.gz deleted file mode 100644 index 13996e6..0000000 Binary files a/11.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/11.0/x86/squashfs-tools.tar.gz b/11.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index 7cea03e..0000000 Binary files a/11.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/11.0/x86/src/Dockerfile b/11.0/x86/src/Dockerfile index 972f878..9470a76 100644 --- a/11.0/x86/src/Dockerfile +++ b/11.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/11.x/x86/release/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/11.0/x86_64/rootfs64.tar.gz b/11.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index 63395a8..0000000 Binary files a/11.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/11.0/x86_64/squashfs-tools.tar.gz b/11.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 7f2c922..0000000 Binary files a/11.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/11.0/x86_64/src/Dockerfile b/11.0/x86_64/src/Dockerfile index 658398e..86c11d8 100644 --- a/11.0/x86_64/src/Dockerfile +++ b/11.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/12.0/Makefile b/12.0/Makefile new file mode 100644 index 0000000..a1d5b13 --- /dev/null +++ b/12.0/Makefile @@ -0,0 +1,10 @@ +SUBDIRS := x86 x86_64 + +.PHONY: all clean $(SUBDIRS) + +all: $(SUBDIRS) + +clean: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/12.0/x86/Dockerfile b/12.0/x86/Dockerfile new file mode 100644 index 0000000..a64f63a --- /dev/null +++ b/12.0/x86/Dockerfile @@ -0,0 +1,15 @@ +FROM scratch +ADD rootfs.tar.gz / +ADD squashfs-tools.tar.gz / + +RUN mkdir -p /tmp/tce/optional \ + && chown -R root:staff /tmp/tce /usr/local/tce.installed \ + && chmod -R g+w /tmp/tce \ + && $(cd etc/sysconfig; ln -s ../../tmp/tce tcedir) \ + && echo -n tc > etc/sysconfig/tcuser \ + && . /etc/init.d/tc-functions \ + && ldconfig \ + && setupHome + +USER tc +CMD ["/bin/sh"] diff --git a/12.0/x86/LICENSE b/12.0/x86/LICENSE new file mode 100644 index 0000000..4616eac --- /dev/null +++ b/12.0/x86/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020 Tatsushi Demachi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/12.0/x86/Makefile b/12.0/x86/Makefile new file mode 100644 index 0000000..52ddf89 --- /dev/null +++ b/12.0/x86/Makefile @@ -0,0 +1,34 @@ +IMAGE_NAME := tinycore +IMAGE_TAG := 12.0-x86 +TMP_IMAGE_NAME := $(IMAGE_NAME)-tar-builder +TMP_CONTAINER_NAME := $(IMAGE_NAME)-tar-exporter + +.PHONY: all build stop clean + +all: build + +build: rootfs.tar.gz + docker build -t $(IMAGE_NAME):$(IMAGE_TAG) . + docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_NAME):latest + +rootfs.tar.gz: squashfs-tools.tar.gz + docker build -t $(TMP_IMAGE_NAME) src + docker run --name $(TMP_CONTAINER_NAME) $(TMP_IMAGE_NAME) + docker wait $(TMP_CONTAINER_NAME) + docker cp $(TMP_CONTAINER_NAME):/tmp/rootfs.tar.gz ./ + docker rm $(TMP_CONTAINER_NAME) + docker rmi $(TMP_IMAGE_NAME) + +squashfs-tools.tar.gz: + docker run -d --privileged --name $(TMP_CONTAINER_NAME) alpine sleep 180 + docker start $(TMP_CONTAINER_NAME) + docker exec -i $(TMP_CONTAINER_NAME) /bin/sh -c 'cat > /tmp/build_squashfs_tools.sh; /bin/sh /tmp/build_squashfs_tools.sh' < src/build_squashfs_tools.sh > squashfs-tools.tar.gz + docker kill $(TMP_CONTAINER_NAME) + docker rm $(TMP_CONTAINER_NAME) + +clean: + docker ps | grep -q $(TMP_CONTAINER_NAME) && docker stop $(TMP_CONTAINER_NAME) || true + docker ps -a | grep -q $(TMP_CONTAINER_NAME) && docker rm $(TMP_CONTAINER_NAME) || true + docker images $(IMAGE_NAME) | grep -q $(IMAGE_TAG) && docker rmi $(IMAGE_NAME):$(IMAGE_TAG) || true + docker images $(IMAGE_NAME) | grep -q latest && docker rmi $(IMAGE_NAME):latest || true + docker images | grep -q $(TMP_IMAGE_NAME) && docker rmi $(TMP_IMAGE_NAME) || true diff --git a/12.0/x86/README.md b/12.0/x86/README.md new file mode 100644 index 0000000..3e79b29 --- /dev/null +++ b/12.0/x86/README.md @@ -0,0 +1,32 @@ +Tiny Core Linux x86 Docker Image Builder +======================================== + +Dockerfile and helper scripts for building a very small CLI system image based +on Tiny Core Linux developed at [The Core Project](http://tinycorelinux.net). +It builds Core 11.0 x86 image by using following packages which were +converted those archive type from The Core Project packages. + +- rootfs.tar.gz: contains base system binaries and a file system layout +- squashfs-tools.tar.gz: contains a squashfs builder and expander + +Those original packages are found under http://tinycorelinux.net/11.x/x86 + +## How to build the image + +Just run + +```bash +make +``` + +To clean up the directory, run + +```bash +make clean +``` + +## License + +rootfs.tar.gz, squashfs-tools.tar.gz and tce-load.patch are under +[GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). The other build scripts are +under [MIT](LICENSE). diff --git a/12.0/x86/src/Dockerfile b/12.0/x86/src/Dockerfile new file mode 100644 index 0000000..9bcf737 --- /dev/null +++ b/12.0/x86/src/Dockerfile @@ -0,0 +1,18 @@ +FROM alpine:latest + +ADD tce-load.patch /tmp/ +RUN apk add --no-cache curl patch \ + && curl -SLO http://www.tinycorelinux.net/12.x/x86/release/distribution_files/rootfs.gz \ + && mkdir rootfs \ + && cd rootfs \ + && gzip -dc ../rootfs.gz | cpio -id \ + && rm -f ../rootfs.gz \ + && cd usr/bin \ + && patch < /tmp/tce-load.patch \ + && cd ../.. \ + && rm -f /tmp/tce-load.patch \ + && tar cf - . | gzip -c > /tmp/rootfs.tar.gz \ + && cd .. \ + && rm -rf rootfs + +CMD ["/bin/true"] diff --git a/12.0/x86/src/build_squashfs_tools.sh b/12.0/x86/src/build_squashfs_tools.sh new file mode 100755 index 0000000..2a6c730 --- /dev/null +++ b/12.0/x86/src/build_squashfs_tools.sh @@ -0,0 +1,39 @@ +#!/bin/sh +URL_TCZ=http://tinycorelinux.net/12.x/x86/tcz + +apk add --no-cache curl squashfs-tools >/dev/null + +download_tcz() { + # Ignore empty/whitespace only + [ -z "$(echo $1)" ] && return + [ -f "$1" ] && return + curl -SLO $URL_TCZ/$1 >/dev/null + # Attempt to download .dep, but it might not exist + curl --fail -LO $URL_TCZ/$1.dep >/dev/null 2>&1 + # Make sure the .dep has an empty last line + [ -f "$1.dep" ] && echo >> "$1.dep" +} + +# Download squashfs-tools.tcz +download_tcz squashfs-tools.tcz + +# Download any found dependencies, repeat 4 times for "recursion" +if [ -f squashfs-tools.tcz.dep ]; then + COUNTDOWN=5 + while [ "$COUNTDOWN" -gt 0 ]; do + COUNTDOWN=$(($COUNTDOWN - 1)) + for t in $(cat *.dep|sort|uniq); do + download_tcz $t + done + done +fi + +[ -d /mnt ] || mkdir /mnt + +# Extract all of the downloaded tcz files +for t in $(find -name '*.tcz'); do + unsquashfs -f -d /mnt $t >/dev/null +done + +# Make a tarball of all of it and print to stdout +tar cf - -C /mnt . | gzip -c diff --git a/12.0/x86/src/tce-load.patch b/12.0/x86/src/tce-load.patch new file mode 100644 index 0000000..7a66f0e --- /dev/null +++ b/12.0/x86/src/tce-load.patch @@ -0,0 +1,39 @@ +--- tce-load.orig 2020-03-01 03:44:26.000000000 +0000 ++++ tce-load 2020-03-01 03:49:22.300332000 +0000 +@@ -81,15 +81,15 @@ + + copyInstall() { + [ -d /mnt/test ] || sudo /bin/mkdir -p /mnt/test +- sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro ++ sudo /usr/local/bin/unsquashfs -f -d /mnt/test $1 + if [ "$?" == 0 ]; then + if [ "$(ls -A /mnt/test)" ]; then + yes "$FORCE" | sudo /bin/cp -ai /mnt/test/. / 2>/dev/null + [ -n "`find /mnt/test/ -type d -name modules`" ] && MODULES=TRUE + fi +- sudo /bin/umount -d /mnt/test ++ sudo rm -rf /mnt/test + fi +- [ "$BOOTING" ] || rmdir /mnt/test ++ [ "$BOOTING" ] || [ -d /mnt/test ] && rmdir /mnt/test + } + + update_system() { +@@ -269,7 +269,7 @@ + F="${F##*/}" + app_exists "$F" "." || fetch_app "$F" + [ -f "$TCEINSTALLED/${F%.*}" ] || install "$F" +- done || exit 1 # subshell cannot exit directly ++ done || exit 0 # subshell cannot exit directly + fi + + if [ "$TARGETSLOCAL" ]; then +@@ -286,7 +286,7 @@ + abort_to_saved_dir + fi + fi +- done || exit 1 # subshell cannot exit directly ++ done || exit 0 # subshell cannot exit directly + fi + + [ "$BOOTING" ] && exit 0 diff --git a/12.0/x86_64/Dockerfile b/12.0/x86_64/Dockerfile new file mode 100644 index 0000000..2752d15 --- /dev/null +++ b/12.0/x86_64/Dockerfile @@ -0,0 +1,15 @@ +FROM scratch +ADD rootfs64.tar.gz / +ADD squashfs-tools.tar.gz / + +RUN mkdir -p /tmp/tce/optional \ + && chown -R root:staff /tmp/tce /usr/local/tce.installed \ + && chmod -R g+w /tmp/tce \ + && $(cd etc/sysconfig; ln -s ../../tmp/tce tcedir) \ + && echo -n tc > etc/sysconfig/tcuser \ + && . /etc/init.d/tc-functions \ + && ldconfig \ + && setupHome + +USER tc +CMD ["/bin/sh"] diff --git a/12.0/x86_64/LICENSE b/12.0/x86_64/LICENSE new file mode 100644 index 0000000..4616eac --- /dev/null +++ b/12.0/x86_64/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020 Tatsushi Demachi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/12.0/x86_64/Makefile b/12.0/x86_64/Makefile new file mode 100644 index 0000000..7a7ff88 --- /dev/null +++ b/12.0/x86_64/Makefile @@ -0,0 +1,32 @@ +IMAGE_NAME := tinycore +IMAGE_TAG := 12.0-x86_64 +TMP_IMAGE_NAME := $(IMAGE_NAME)-tar-builder +TMP_CONTAINER_NAME := $(IMAGE_NAME)-tar-exporter + +.PHONY: all build stop clean + +all: build + +build: rootfs64.tar.gz + docker build -t $(IMAGE_NAME):$(IMAGE_TAG) . + +rootfs64.tar.gz: squashfs-tools.tar.gz + docker build -t $(TMP_IMAGE_NAME) src + docker run --name $(TMP_CONTAINER_NAME) $(TMP_IMAGE_NAME) + docker wait $(TMP_CONTAINER_NAME) + docker cp $(TMP_CONTAINER_NAME):/tmp/rootfs64.tar.gz ./ + docker rm $(TMP_CONTAINER_NAME) + docker rmi $(TMP_IMAGE_NAME) + +squashfs-tools.tar.gz: + docker run -d --privileged --name $(TMP_CONTAINER_NAME) alpine sleep 180 + docker start $(TMP_CONTAINER_NAME) + docker exec -i $(TMP_CONTAINER_NAME) /bin/sh -c 'cat > /tmp/build_squashfs_tools.sh; /bin/sh /tmp/build_squashfs_tools.sh' < src/build_squashfs_tools.sh > squashfs-tools.tar.gz + docker kill $(TMP_CONTAINER_NAME) + docker rm $(TMP_CONTAINER_NAME) + +clean: + docker ps | grep -q $(TMP_CONTAINER_NAME) && docker stop $(TMP_CONTAINER_NAME) || true + docker ps -a | grep -q $(TMP_CONTAINER_NAME) && docker rm $(TMP_CONTAINER_NAME) || true + docker images $(IMAGE_NAME) | grep -q $(IMAGE_TAG) && docker rmi $(IMAGE_NAME):$(IMAGE_TAG) || true + docker images | grep -q $(TMP_IMAGE_NAME) && docker rmi $(TMP_IMAGE_NAME) || true diff --git a/12.0/x86_64/README.md b/12.0/x86_64/README.md new file mode 100644 index 0000000..df7fc2c --- /dev/null +++ b/12.0/x86_64/README.md @@ -0,0 +1,32 @@ +Tiny Core Linux x86\_64 Docker Image Builder +============================================ + +Dockerfile and helper scripts for building a very small CLI system image based +on Tiny Core Linux developed at [The Core Project](http://tinycorelinux.net). +It builds Core 11.0 x86\_64 image by using following packages which were +converted those archive type from The Core Project packages. + +- rootfs64.tar.gz: contains base system binaries and a file system layout +- squashfs-tools.tar.gz: contains a squashfs builder and expander + +Those original packages are found under http://tinycorelinux.net/11.x/x86_64 + +## How to build the image + +Just run + +```bash +make +``` + +To clean up the directory, run + +```bash +make clean +``` + +## License + +rootfs64.tar.gz, squashfs-tools.tar.gz and tce-load.patch are under +[GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). The other build scripts are +under [MIT](LICENSE). diff --git a/12.0/x86_64/src/Dockerfile b/12.0/x86_64/src/Dockerfile new file mode 100644 index 0000000..4905b09 --- /dev/null +++ b/12.0/x86_64/src/Dockerfile @@ -0,0 +1,18 @@ +FROM alpine:latest + +ADD tce-load.patch /tmp/ +RUN apk add --no-cache curl patch \ + && curl -SLO http://www.tinycorelinux.net/12.x/x86_64/release/distribution_files/rootfs64.gz \ + && mkdir rootfs64 \ + && cd rootfs64 \ + && gzip -dc ../rootfs64.gz | cpio -id \ + && rm -f ../rootfs64.gz \ + && cd usr/bin \ + && patch < /tmp/tce-load.patch \ + && cd ../.. \ + && rm -f /tmp/tce-load.patch \ + && tar cf - . | gzip -c > /tmp/rootfs64.tar.gz \ + && cd .. \ + && rm -rf rootfs64 + +CMD ["/bin/true"] diff --git a/12.0/x86_64/src/build_squashfs_tools.sh b/12.0/x86_64/src/build_squashfs_tools.sh new file mode 100755 index 0000000..9f4a085 --- /dev/null +++ b/12.0/x86_64/src/build_squashfs_tools.sh @@ -0,0 +1,39 @@ +#!/bin/sh +URL_TCZ=http://tinycorelinux.net/12.x/x86_64/tcz + +apk add --no-cache curl squashfs-tools >/dev/null + +download_tcz() { + # Ignore empty/whitespace only + [ -z "$(echo $1)" ] && return + [ -f "$1" ] && return + curl -SLO $URL_TCZ/$1 >/dev/null + # Attempt to download .dep, but it might not exist + curl --fail -LO $URL_TCZ/$1.dep >/dev/null 2>&1 + # Make sure the .dep has an empty last line + [ -f "$1.dep" ] && echo >> "$1.dep" +} + +# Download squashfs-tools.tcz +download_tcz squashfs-tools.tcz + +# Download any found dependencies, repeat 4 times for "recursion" +if [ -f squashfs-tools.tcz.dep ]; then + COUNTDOWN=5 + while [ "$COUNTDOWN" -gt 0 ]; do + COUNTDOWN=$(($COUNTDOWN - 1)) + for t in $(cat *.dep|sort|uniq); do + download_tcz $t + done + done +fi + +[ -d /mnt ] || mkdir /mnt + +# Extract all of the downloaded tcz files +for t in $(find -name '*.tcz'); do + unsquashfs -f -d /mnt $t >/dev/null +done + +# Make a tarball of all of it and print to stdout +tar cf - -C /mnt . | gzip -c diff --git a/12.0/x86_64/src/tce-load.patch b/12.0/x86_64/src/tce-load.patch new file mode 100644 index 0000000..7a66f0e --- /dev/null +++ b/12.0/x86_64/src/tce-load.patch @@ -0,0 +1,39 @@ +--- tce-load.orig 2020-03-01 03:44:26.000000000 +0000 ++++ tce-load 2020-03-01 03:49:22.300332000 +0000 +@@ -81,15 +81,15 @@ + + copyInstall() { + [ -d /mnt/test ] || sudo /bin/mkdir -p /mnt/test +- sudo /bin/mount $1 /mnt/test -t squashfs -o loop,ro ++ sudo /usr/local/bin/unsquashfs -f -d /mnt/test $1 + if [ "$?" == 0 ]; then + if [ "$(ls -A /mnt/test)" ]; then + yes "$FORCE" | sudo /bin/cp -ai /mnt/test/. / 2>/dev/null + [ -n "`find /mnt/test/ -type d -name modules`" ] && MODULES=TRUE + fi +- sudo /bin/umount -d /mnt/test ++ sudo rm -rf /mnt/test + fi +- [ "$BOOTING" ] || rmdir /mnt/test ++ [ "$BOOTING" ] || [ -d /mnt/test ] && rmdir /mnt/test + } + + update_system() { +@@ -269,7 +269,7 @@ + F="${F##*/}" + app_exists "$F" "." || fetch_app "$F" + [ -f "$TCEINSTALLED/${F%.*}" ] || install "$F" +- done || exit 1 # subshell cannot exit directly ++ done || exit 0 # subshell cannot exit directly + fi + + if [ "$TARGETSLOCAL" ]; then +@@ -286,7 +286,7 @@ + abort_to_saved_dir + fi + fi +- done || exit 1 # subshell cannot exit directly ++ done || exit 0 # subshell cannot exit directly + fi + + [ "$BOOTING" ] && exit 0 diff --git a/6.0/x86/rootfs.tar.gz b/6.0/x86/rootfs.tar.gz deleted file mode 100644 index 8dd90c4..0000000 Binary files a/6.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/6.0/x86/squashfs-tools.tar.gz b/6.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index d6e589f..0000000 Binary files a/6.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.0/x86/src/Dockerfile b/6.0/x86/src/Dockerfile index 75d95ba..bff6f84 100644 --- a/6.0/x86/src/Dockerfile +++ b/6.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86/archive/6.0/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/6.0/x86_64/rootfs64.tar.gz b/6.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index 38d2d07..0000000 Binary files a/6.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/6.0/x86_64/squashfs-tools.tar.gz b/6.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index ba5b6fd..0000000 Binary files a/6.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.0/x86_64/src/Dockerfile b/6.0/x86_64/src/Dockerfile index f97f0ba..7b3e5a1 100644 --- a/6.0/x86_64/src/Dockerfile +++ b/6.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86_64/archive/6.0/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/6.1/x86/rootfs.tar.gz b/6.1/x86/rootfs.tar.gz deleted file mode 100644 index 7576c26..0000000 Binary files a/6.1/x86/rootfs.tar.gz and /dev/null differ diff --git a/6.1/x86/squashfs-tools.tar.gz b/6.1/x86/squashfs-tools.tar.gz deleted file mode 100644 index ef82830..0000000 Binary files a/6.1/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.1/x86/src/Dockerfile b/6.1/x86/src/Dockerfile index 44ed14d..fef15b7 100644 --- a/6.1/x86/src/Dockerfile +++ b/6.1/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86/archive/6.1/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/6.1/x86_64/rootfs64.tar.gz b/6.1/x86_64/rootfs64.tar.gz deleted file mode 100644 index 0519d37..0000000 Binary files a/6.1/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/6.1/x86_64/squashfs-tools.tar.gz b/6.1/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 70a041f..0000000 Binary files a/6.1/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.1/x86_64/src/Dockerfile b/6.1/x86_64/src/Dockerfile index af02752..79e66ad 100644 --- a/6.1/x86_64/src/Dockerfile +++ b/6.1/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86_64/archive/6.1/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/6.2/x86/rootfs.tar.gz b/6.2/x86/rootfs.tar.gz deleted file mode 100644 index a6d9a54..0000000 Binary files a/6.2/x86/rootfs.tar.gz and /dev/null differ diff --git a/6.2/x86/squashfs-tools.tar.gz b/6.2/x86/squashfs-tools.tar.gz deleted file mode 100644 index bf54a14..0000000 Binary files a/6.2/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.2/x86/src/Dockerfile b/6.2/x86/src/Dockerfile index 87d8531..89065e3 100644 --- a/6.2/x86/src/Dockerfile +++ b/6.2/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86/archive/6.2/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/6.2/x86_64/rootfs64.tar.gz b/6.2/x86_64/rootfs64.tar.gz deleted file mode 100644 index 4c76c2e..0000000 Binary files a/6.2/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/6.2/x86_64/squashfs-tools.tar.gz b/6.2/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index ac030cb..0000000 Binary files a/6.2/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.2/x86_64/src/Dockerfile b/6.2/x86_64/src/Dockerfile index 8059227..a10e016 100644 --- a/6.2/x86_64/src/Dockerfile +++ b/6.2/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86_64/archive/6.2/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/6.3/x86/rootfs.tar.gz b/6.3/x86/rootfs.tar.gz deleted file mode 100644 index 6501d17..0000000 Binary files a/6.3/x86/rootfs.tar.gz and /dev/null differ diff --git a/6.3/x86/squashfs-tools.tar.gz b/6.3/x86/squashfs-tools.tar.gz deleted file mode 100644 index e6dd89a..0000000 Binary files a/6.3/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.3/x86/src/Dockerfile b/6.3/x86/src/Dockerfile index 4490571..41c8aa0 100644 --- a/6.3/x86/src/Dockerfile +++ b/6.3/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86/archive/6.3/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/6.3/x86_64/rootfs64.tar.gz b/6.3/x86_64/rootfs64.tar.gz deleted file mode 100644 index 2323842..0000000 Binary files a/6.3/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/6.3/x86_64/squashfs-tools.tar.gz b/6.3/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 44db8d6..0000000 Binary files a/6.3/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.3/x86_64/src/Dockerfile b/6.3/x86_64/src/Dockerfile index 66ba6ef..df7741a 100644 --- a/6.3/x86_64/src/Dockerfile +++ b/6.3/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86_64/archive/6.3/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/6.4/x86/rootfs.tar.gz b/6.4/x86/rootfs.tar.gz deleted file mode 100644 index 958f327..0000000 Binary files a/6.4/x86/rootfs.tar.gz and /dev/null differ diff --git a/6.4/x86/squashfs-tools.tar.gz b/6.4/x86/squashfs-tools.tar.gz deleted file mode 100644 index 535b7d7..0000000 Binary files a/6.4/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.4/x86/src/Dockerfile b/6.4/x86/src/Dockerfile index 3e96354..d9e448b 100644 --- a/6.4/x86/src/Dockerfile +++ b/6.4/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86/release/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/6.4/x86_64/rootfs64.tar.gz b/6.4/x86_64/rootfs64.tar.gz deleted file mode 100644 index ec61d27..0000000 Binary files a/6.4/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/6.4/x86_64/squashfs-tools.tar.gz b/6.4/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index b4c9d18..0000000 Binary files a/6.4/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/6.4/x86_64/src/Dockerfile b/6.4/x86_64/src/Dockerfile index 1386953..5d584b6 100644 --- a/6.4/x86_64/src/Dockerfile +++ b/6.4/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/6.x/x86_64/release/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/7.0/x86/rootfs.tar.gz b/7.0/x86/rootfs.tar.gz deleted file mode 100644 index 2a64cfd..0000000 Binary files a/7.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/7.0/x86/squashfs-tools.tar.gz b/7.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index d84cd55..0000000 Binary files a/7.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.0/x86/src/Dockerfile b/7.0/x86/src/Dockerfile index 9ebc7b7..6d85b3b 100644 --- a/7.0/x86/src/Dockerfile +++ b/7.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86/archive/7.0/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/7.0/x86_64/rootfs64.tar.gz b/7.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index 8076429..0000000 Binary files a/7.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/7.0/x86_64/squashfs-tools.tar.gz b/7.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 0d4a34b..0000000 Binary files a/7.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.0/x86_64/src/Dockerfile b/7.0/x86_64/src/Dockerfile index db1e7ea..e6212ee 100644 --- a/7.0/x86_64/src/Dockerfile +++ b/7.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86_64/archive/7.0/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/7.1/x86/rootfs.tar.gz b/7.1/x86/rootfs.tar.gz deleted file mode 100644 index 64a034a..0000000 Binary files a/7.1/x86/rootfs.tar.gz and /dev/null differ diff --git a/7.1/x86/squashfs-tools.tar.gz b/7.1/x86/squashfs-tools.tar.gz deleted file mode 100644 index 30f87df..0000000 Binary files a/7.1/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.1/x86/src/Dockerfile b/7.1/x86/src/Dockerfile index 6219497..ad46353 100644 --- a/7.1/x86/src/Dockerfile +++ b/7.1/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86/archive/7.1/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/7.1/x86_64/rootfs64.tar.gz b/7.1/x86_64/rootfs64.tar.gz deleted file mode 100644 index e248bf9..0000000 Binary files a/7.1/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/7.1/x86_64/squashfs-tools.tar.gz b/7.1/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 26cf695..0000000 Binary files a/7.1/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.1/x86_64/src/Dockerfile b/7.1/x86_64/src/Dockerfile index 1bf168e..30c66a5 100644 --- a/7.1/x86_64/src/Dockerfile +++ b/7.1/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86_64/archive/7.1/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/7.2/x86/rootfs.tar.gz b/7.2/x86/rootfs.tar.gz deleted file mode 100644 index 14df71a..0000000 Binary files a/7.2/x86/rootfs.tar.gz and /dev/null differ diff --git a/7.2/x86/squashfs-tools.tar.gz b/7.2/x86/squashfs-tools.tar.gz deleted file mode 100644 index 30f87df..0000000 Binary files a/7.2/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.2/x86/src/Dockerfile b/7.2/x86/src/Dockerfile index e4cd83e..25fc4f7 100644 --- a/7.2/x86/src/Dockerfile +++ b/7.2/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86/archive/7.2/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/7.2/x86_64/rootfs64.tar.gz b/7.2/x86_64/rootfs64.tar.gz deleted file mode 100644 index 8b9590d..0000000 Binary files a/7.2/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/7.2/x86_64/squashfs-tools.tar.gz b/7.2/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 26cf695..0000000 Binary files a/7.2/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/7.2/x86_64/src/Dockerfile b/7.2/x86_64/src/Dockerfile index 57cc3e3..9feaad3 100644 --- a/7.2/x86_64/src/Dockerfile +++ b/7.2/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/7.x/x86_64/archive/7.2/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/8.0/x86/rootfs.tar.gz b/8.0/x86/rootfs.tar.gz deleted file mode 100644 index 6d554e8..0000000 Binary files a/8.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/8.0/x86/squashfs-tools.tar.gz b/8.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index 20b7a3b..0000000 Binary files a/8.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.0/x86/src/Dockerfile b/8.0/x86/src/Dockerfile index ee49c36..f5908b8 100644 --- a/8.0/x86/src/Dockerfile +++ b/8.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86/archive/8.0/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/8.0/x86_64/rootfs64.tar.gz b/8.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index 0832cba..0000000 Binary files a/8.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/8.0/x86_64/squashfs-tools.tar.gz b/8.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 4983bca..0000000 Binary files a/8.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.0/x86_64/src/Dockerfile b/8.0/x86_64/src/Dockerfile index 4c7e6aa..3351a84 100644 --- a/8.0/x86_64/src/Dockerfile +++ b/8.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86_64/archive/8.0/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/8.1/x86/rootfs.tar.gz b/8.1/x86/rootfs.tar.gz deleted file mode 100644 index bfdb2fe..0000000 Binary files a/8.1/x86/rootfs.tar.gz and /dev/null differ diff --git a/8.1/x86/squashfs-tools.tar.gz b/8.1/x86/squashfs-tools.tar.gz deleted file mode 100644 index 820408d..0000000 Binary files a/8.1/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.1/x86/src/Dockerfile b/8.1/x86/src/Dockerfile index 91cd8b4..c6e4a6d 100644 --- a/8.1/x86/src/Dockerfile +++ b/8.1/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86/archive/8.1.1/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/8.1/x86_64/rootfs64.tar.gz b/8.1/x86_64/rootfs64.tar.gz deleted file mode 100644 index a166234..0000000 Binary files a/8.1/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/8.1/x86_64/squashfs-tools.tar.gz b/8.1/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 915d773..0000000 Binary files a/8.1/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.1/x86_64/src/Dockerfile b/8.1/x86_64/src/Dockerfile index 0993e03..f858d8e 100644 --- a/8.1/x86_64/src/Dockerfile +++ b/8.1/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86_64/archive/8.1.1/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/8.2/x86/rootfs.tar.gz b/8.2/x86/rootfs.tar.gz deleted file mode 100644 index 91839be..0000000 Binary files a/8.2/x86/rootfs.tar.gz and /dev/null differ diff --git a/8.2/x86/squashfs-tools.tar.gz b/8.2/x86/squashfs-tools.tar.gz deleted file mode 100644 index 820408d..0000000 Binary files a/8.2/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.2/x86/src/Dockerfile b/8.2/x86/src/Dockerfile index 68c5e73..d975da0 100644 --- a/8.2/x86/src/Dockerfile +++ b/8.2/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86/release/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/8.2/x86_64/rootfs64.tar.gz b/8.2/x86_64/rootfs64.tar.gz deleted file mode 100644 index 8b9626e..0000000 Binary files a/8.2/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/8.2/x86_64/squashfs-tools.tar.gz b/8.2/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 915d773..0000000 Binary files a/8.2/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/8.2/x86_64/src/Dockerfile b/8.2/x86_64/src/Dockerfile index 52c9f70..7fb9907 100644 --- a/8.2/x86_64/src/Dockerfile +++ b/8.2/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/8.x/x86_64/release/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/9.0/x86/rootfs.tar.gz b/9.0/x86/rootfs.tar.gz deleted file mode 100644 index 97091ed..0000000 Binary files a/9.0/x86/rootfs.tar.gz and /dev/null differ diff --git a/9.0/x86/squashfs-tools.tar.gz b/9.0/x86/squashfs-tools.tar.gz deleted file mode 100644 index 1153033..0000000 Binary files a/9.0/x86/squashfs-tools.tar.gz and /dev/null differ diff --git a/9.0/x86/src/Dockerfile b/9.0/x86/src/Dockerfile index 1120774..96dbd9f 100644 --- a/9.0/x86/src/Dockerfile +++ b/9.0/x86/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/9.x/x86/release/distribution_files/rootfs.gz \ && mkdir rootfs \ && cd rootfs \ diff --git a/9.0/x86_64/rootfs64.tar.gz b/9.0/x86_64/rootfs64.tar.gz deleted file mode 100644 index fd685e8..0000000 Binary files a/9.0/x86_64/rootfs64.tar.gz and /dev/null differ diff --git a/9.0/x86_64/squashfs-tools.tar.gz b/9.0/x86_64/squashfs-tools.tar.gz deleted file mode 100644 index 53fb7b5..0000000 Binary files a/9.0/x86_64/squashfs-tools.tar.gz and /dev/null differ diff --git a/9.0/x86_64/src/Dockerfile b/9.0/x86_64/src/Dockerfile index 91bbf06..9b88ab5 100644 --- a/9.0/x86_64/src/Dockerfile +++ b/9.0/x86_64/src/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM alpine:latest ADD tce-load.patch /tmp/ -RUN apk add --no-cache curl \ +RUN apk add --no-cache curl patch \ && curl -SLO http://www.tinycorelinux.net/9.x/x86_64/release/distribution_files/rootfs64.gz \ && mkdir rootfs64 \ && cd rootfs64 \ diff --git a/Makefile b/Makefile index 17db7c7..9c26f7c 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ -SUBDIRS := 6.0 6.1 6.2 6.3 6.4 7.0 7.1 7.2 8.0 8.1 8.2 9.0 10.0 10.1 11.0 +SUBDIRS := 6.0 6.1 6.2 6.3 6.4 7.0 7.1 7.2 8.0 8.1 8.2 9.0 10.0 10.1 11.0 12.0 .PHONY: all clean $(SUBDIRS) all: $(SUBDIRS) clean: $(SUBDIRS) + find . -type f -iname \*.tar.gz -delete $(SUBDIRS): $(MAKE) -C $@ $(MAKECMDGOALS)