Skip to content

Commit f8c7c44

Browse files
committed
remove github-cli (too large), install go from download to avoid gcc dep (also too large)
1 parent b3b5530 commit f8c7c44

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
vm:
44
rm -rf ./vm/image
5+
rm -rf ./dist
56
env86 create --with-guest --from-docker ./vm/Dockerfile ./vm/image
67
env86 boot --cdp --cold --ttyS0 --save --no-console --exit-on="localhost:~#" ./vm/image
7-
rm -rf ./dist
88
env86 prepare ./vm/image ./dist

vm/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ RUN apk add openrc \
88
alpine-base \
99
agetty \
1010
alpine-conf \
11-
github-cli \
1211
git \
13-
go \
1412
openssh
1513

14+
RUN wget https://go.dev/dl/go1.23.0.linux-386.tar.gz \
15+
&& tar -C /usr/local -xzf go1.23.0.linux-386.tar.gz \
16+
&& rm go1.23.0.linux-386.tar.gz \
17+
&& ln -s /usr/local/go/bin/go /usr/bin/go
18+
1619
# Install mkinitfs from edge (todo: remove this when 3.19+ has worked properly with 9pfs)
1720
RUN apk add mkinitfs --no-cache --allow-untrusted --repository https://dl-cdn.alpinelinux.org/alpine/edge/main/
1821

@@ -39,6 +42,7 @@ COPY ./guest86.service /etc/init.d/guest86
3942
# there is a bug where it always crashes on first run
4043
RUN echo "rc-service guest86 start && rc-service guest86 stop && rc-service guest86 start" > /root/.profile
4144

45+
4246
# https://wiki.alpinelinux.org/wiki/Alpine_Linux_in_a_chroot#Preparing_init_services
4347
RUN for i in devfs dmesg mdev hwdrivers; do rc-update add $i sysinit; done
4448
RUN for i in hwclock modules sysctl hostname bootmisc; do rc-update add $i boot; done

0 commit comments

Comments
 (0)