Skip to content
This repository was archived by the owner on Aug 3, 2021. It is now read-only.

Commit 8d632f4

Browse files
committed
adding more entropy
1 parent eb4962f commit 8d632f4

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ on:
55
pull_request:
66

77
push:
8+
tags:
9+
- '*'
810

911
schedule:
1012
- cron: 0 0 * * 0
1113

1214
jobs:
1315

14-
build-test:
16+
build:
1517

1618
runs-on: ubuntu-latest
1719

@@ -46,8 +48,14 @@ jobs:
4648
name: boot2docker.iso
4749
path: boot2docker.iso
4850

51+
release:
52+
if: startsWith(github.ref, 'refs/tags/')
53+
runs-on: ubuntu-latest
54+
needs:
55+
- build
56+
steps:
4957
- uses: ncipollo/release-action@v1
5058
with:
51-
name: latest
59+
allowUpdates: true
5260
artifacts: "boot2docker.iso"
5361
token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ENV TCL_MIRRORS http://distro.ibiblio.org/tinycorelinux http://repo.tinycorelinu
4141
ENV TCL_MAJOR 11.x
4242
ENV TCL_VERSION 11.1
4343

44-
# http://distro.ibiblio.org/tinycorelinux/8.x/x86_64/archive/8.2.1/distribution_files/rootfs64.gz.md5.txt
44+
# http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/release/distribution_files/rootfs64.gz.md5.txt
4545
# updated via "update.sh"
4646
ENV TCL_ROOTFS="rootfs64.gz" TCL_ROOTFS_MD5="3c5846fd0eb2f4ecc15e424678ef7919"
4747

@@ -110,19 +110,19 @@ RUN tcl-chroot adduser \
110110
echo 'docker ALL = NOPASSWD: ALL' >> etc/sudoers; \
111111
sed -i 's/USER="tc"/USER="docker"/g' etc/init.d/tc-* etc/init.d/services/*
112112

113-
# https://github.com/tatsushid/docker-tinycore/blob/017b258a08a41399f65250c9865a163226c8e0bf/8.2/x86_64/Dockerfile
113+
# https://github.com/tatsushid/docker-tinycore/blob/cbffbadd85cd3372fb1a8a0da9d9a817ceb6a159/11.0/x86_64/Dockerfile
114114
RUN mkdir -p proc; \
115115
touch proc/cmdline; \
116116
mkdir -p tmp/tce/optional usr/local/tce.installed/optional; \
117117
chown -R root:staff tmp/tce usr/local/tce.installed; \
118118
chmod -R g+w tmp/tce; \
119119
ln -sT ../../tmp/tce etc/sysconfig/tcedir; \
120120
echo -n docker > etc/sysconfig/tcuser; \
121-
tcl-chroot sh -c '. /etc/init.d/tc-functions && setupHome'
121+
tcl-chroot sh -c '. /etc/init.d/tc-functions && ldconfig && setupHome'
122122

123123
# as of squashfs-tools 4.4, TCL's unsquashfs is broken... (fails to unsquashfs *many* core tcz files)
124124
# https://github.com/plougher/squashfs-tools/releases
125-
ENV SQUASHFS_VERSION 4.4
125+
ENV SQUASHFS_VERSION 4.4-git.1
126126
RUN wget -O squashfs.tgz "https://github.com/plougher/squashfs-tools/archive/$SQUASHFS_VERSION.tar.gz"; \
127127
tar --directory=/usr/src --extract --file=squashfs.tgz; \
128128
make -C "/usr/src/squashfs-tools-$SQUASHFS_VERSION/squashfs-tools" \
@@ -319,7 +319,9 @@ RUN tcl-tce-load \
319319
rsync \
320320
tar \
321321
util-linux \
322-
xz
322+
xz \
323+
# Weird docker compose issues https://github.com/docker/compose/issues/6678#issuecomment-499319237
324+
haveged
323325

324326
# bash-completion puts auto-load in /usr/local/etc/profile.d instead of /etc/profile.d
325327
# (this one-liner is the same as the loop at the end of /etc/profile with an adjusted search path)
@@ -406,7 +408,7 @@ RUN wget -O /xen.tgz "https://github.com/xenserver/xe-guest-utilities/archive/v$
406408
# download "golang.org/x/sys/unix" dependency (new in 7.14.0)
407409
RUN cd /usr/src/xen; \
408410
mkdir -p GOPATH/src/golang.org/x/sys; \
409-
wget -O sys.tgz 'https://github.com/golang/sys/archive/fc99dfbffb4e5ed5758a37e31dd861afe285406b.tar.gz'; \
411+
wget -O sys.tgz 'https://github.com/golang/sys/archive/0d417f6369309be088e227ead8736fb722d759d3.tar.gz'; \
410412
tar -xf sys.tgz -C GOPATH/src/golang.org/x/sys --strip-components 1; \
411413
rm sys.tgz
412414
RUN GOPATH='/usr/src/xen/GOPATH' make -C /usr/src/xen -j "$(nproc)" PRODUCT_VERSION="$XEN_VERSION" RELEASE='boot2docker'; \

0 commit comments

Comments
 (0)