Skip to content

Commit cace001

Browse files
committed
fix
1 parent c2beccd commit cace001

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

Github/Runners/bootstrap/alpine.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ set -x
3333
locale-gen
3434
locale-gen "en_US.UTF-8"
3535
#Cleanup
36-
rm -rfv "/"{tmp,proc,sys,dev,run}
37-
mkdir -pv "/"{tmp,proc,sys,dev,run/media,mnt,media,home}
38-
rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}
39-
touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}
36+
bash -c "rm -rfv /{tmp,proc,sys,dev,run}"
37+
bash -c "mkdir -pv /{tmp,proc,sys,dev,run/media,mnt,media,home}"
38+
bash -c "rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
39+
bash -c "touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
4040
apk info -L
41-
rm -rfv "/var/cache/apk/"*'
41+
rm -rfv "/var/cache/apk/"*
42+
'
4243
##Export
4344
docker export "$(docker ps -aqf 'name=alpine-base')" --output "rootfs.tar"
4445
if [[ -f "./rootfs.tar" ]] && [[ $(stat -c%s "./rootfs.tar") -gt 10000 ]]; then

Github/Runners/bootstrap/debian.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ set -x
5757
find "/var/log" -type f -name "*.log" -exec rm -rfv "{}" \; 2>/dev/null
5858
rm -rfv "/var/lib/apt/lists/"*
5959
rm -rfv "/var/cache/apt/"*
60-
rm -rfv "/"{tmp,proc,sys,dev,run}
61-
mkdir -pv "/"{tmp,proc,sys,dev,run/media,mnt,media,home}
62-
rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}
63-
touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}'
60+
bash -c "rm -rfv /{tmp,proc,sys,dev,run}"
61+
bash -c "mkdir -pv /{tmp,proc,sys,dev,run/media,mnt,media,home}"
62+
bash -c "rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
63+
bash -c "touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
64+
'
6465
##Export
6566
docker export "$(docker ps -aqf 'name=debian-base')" --output "rootfs.tar"
6667
if [[ -f "./rootfs.tar" ]] && [[ $(stat -c%s "./rootfs.tar") -gt 10000 ]]; then

Github/Runners/bootstrap/eweos.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ set -x
9191
find "/var/log" -type f -name "*.log" -exec rm -rfv "{}" \; 2>/dev/null
9292
rm -rfv "/"{tmp,proc,sys,dev,run} 2>/dev/null
9393
mkdir -pv "/"{tmp,proc,sys,dev,run/media,mnt,media,home} 2>/dev/null
94-
rm -fv ""/etc/{host.conf,hosts,nsswitch.conf} 2>/dev/null
95-
touch ""/etc/{host.conf,hosts,nsswitch.conf} 2>/dev/null
96-
hostname 2>/dev/null; cat "/etc/os-release" 2>/dev/null'
94+
rm -fv "/etc/"{host.conf,hosts,nsswitch.conf} 2>/dev/null
95+
touch "/etc/"{host.conf,hosts,nsswitch.conf} 2>/dev/null
96+
hostname 2>/dev/null; cat "/etc/os-release" 2>/dev/null
97+
'
9798
##Export
9899
docker export "$(docker ps -aqf 'name=eweos-base')" --output "rootfs.tar"
99100
if [[ -f "./rootfs.tar" ]] && [[ $(stat -c%s "./rootfs.tar") -gt 10000 ]]; then

Github/Runners/bootstrap/ubuntu.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ set -x
5959
find "/var/log" -type f -name "*.log" -exec rm -rfv "{}" \; 2>/dev/null
6060
rm -rfv "/var/lib/apt/lists/"*
6161
rm -rfv "/var/cache/apt/"*
62-
rm -rfv "/"{tmp,proc,sys,dev,run}
63-
mkdir -pv "/"{tmp,proc,sys,dev,run/media,mnt,media,home}
64-
rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}
65-
touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}'
66-
##Export
62+
bash -c "rm -rfv /{tmp,proc,sys,dev,run}"
63+
bash -c "mkdir -pv /{tmp,proc,sys,dev,run/media,mnt,media,home}"
64+
bash -c "rm -fv /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
65+
bash -c "touch /etc/{host.conf,hosts,passwd,group,nsswitch.conf}"
66+
'
67+
##Export
6768
docker export "$(docker ps -aqf 'name=ubuntu-base')" --output "rootfs.tar"
6869
if [[ -f "./rootfs.tar" ]] && [[ $(stat -c%s "./rootfs.tar") -gt 10000 ]]; then
6970
rsync -achLv --mkpath "./rootfs.tar" "/tmp/rootfs.tar"

0 commit comments

Comments
 (0)