Skip to content

Commit

Permalink
remove github-cli (too large), install go from download to avoid gcc …
Browse files Browse the repository at this point in the history
…dep (also too large)
  • Loading branch information
progrium committed Sep 3, 2024
1 parent b3b5530 commit f8c7c44
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

vm:
rm -rf ./vm/image
rm -rf ./dist
env86 create --with-guest --from-docker ./vm/Dockerfile ./vm/image
env86 boot --cdp --cold --ttyS0 --save --no-console --exit-on="localhost:~#" ./vm/image
rm -rf ./dist
env86 prepare ./vm/image ./dist
8 changes: 6 additions & 2 deletions vm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ RUN apk add openrc \
alpine-base \
agetty \
alpine-conf \
github-cli \
git \
go \
openssh

RUN wget https://go.dev/dl/go1.23.0.linux-386.tar.gz \
&& tar -C /usr/local -xzf go1.23.0.linux-386.tar.gz \
&& rm go1.23.0.linux-386.tar.gz \
&& ln -s /usr/local/go/bin/go /usr/bin/go

# Install mkinitfs from edge (todo: remove this when 3.19+ has worked properly with 9pfs)
RUN apk add mkinitfs --no-cache --allow-untrusted --repository https://dl-cdn.alpinelinux.org/alpine/edge/main/

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


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

0 comments on commit f8c7c44

Please sign in to comment.