Skip to content

Commit 862f8d3

Browse files
committed
Update VM image
1 parent 9d6a531 commit 862f8d3

File tree

3 files changed

+52
-33
lines changed

3 files changed

+52
-33
lines changed

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ inputs:
3535
image:
3636
description: Specifies the name of the image that the disk will be initialized with.
3737
required: false
38-
default: gh-runner-202405080010
38+
default: gh-runner-202405080023
3939
image_family:
4040
description: The image family for the operating system that the boot disk will be initialized with.
4141
required: false

vm/rootfs/etc/preloaded-images

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525
2-
eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879
2+
public.ecr.aws/k5t9d3j5/gitpod-next/dev-environment:cw-1715107995b
33
gitpod/workspace-full
44
mysql:8.0.33
55
bitnami/mysql:8.0.33-debian-11-r24
66
redis
77
node:20
88
localstack/localstack:3.0.0
9+
localstack/localstack:3.4.0
910
registry:2
11+
postgres:15.3-alpine
12+
redis:7.2.4-alpine
13+

vm/setup.sh

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ export DEBIAN_FRONTEND=noninteractive
66

77
RUNNER_USER="runner"
88
RUNNER_DIR="/home/${RUNNER_USER}"
9-
RUNNER_VER=2.316.0
9+
RUNNER_VER=2.316.1
1010

1111
HELM_VERSION=3.14.0
1212
PULUMI_VERSION=3.114.0
1313

1414
DOCKER_USER_UID=33333
1515
DOCKER_GROUP_GID=33333
1616

17-
DOCKER_VERSION=26.0.0
17+
DOCKER_VERSION=26.1.1
1818
DOCKER_COMPOSE_VERSION=v2.26.0
1919
DOCKER_BUILDX_VERSION=0.14.0
2020

@@ -163,7 +163,7 @@ echo "📝 Installing leeway..."
163163
LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
164164
LEEWAY_CACHE_DIR=/var/tmp/cache
165165
LEEWAY_BUILD_DIR=/var/tmp/build
166-
LEEWAY_VERSION="0.8.1"
166+
LEEWAY_VERSION="0.8.3"
167167

168168
mkdir -p "${LEEWAY_CACHE_DIR}" "${LEEWAY_BUILD_DIR}"
169169
chmod 777 -R /var/tmp/
@@ -244,35 +244,44 @@ apt-get autoremove --assume-yes --quiet
244244
# situations, but by using the cluster autoscaler the node rotation removes any benefit.
245245
SERVICES_TO_DISABLE=(
246246
secureboot-db.service
247-
apport-autoreport.service
248-
apport.service
249-
apt-daily-upgrade.service
250-
apt-daily-upgrade.timer
251-
apt-daily.service
252-
apt-daily.timer
253-
atop.service
254-
atopacct.service
255-
bluetooth.target
256-
console-setup.service
257-
e2scrub_reap.service
258-
fstrim.service
259-
keyboard-setup
260-
man-db.service
261-
man-db.timer
262-
motd-news.service
263-
motd-news.timer
264-
netplan-ovs-cleanup.service
265-
systemd-journal-flush
266-
systemd-pcrphase.service
267-
systemd-udev-settle.service
268-
ua-messaging.service
269-
ua-messaging.timer
270-
ua-reboot-cmds.service
271-
ua-timer.service
272-
ua-timer.timer
273-
ubuntu-advantage.service
274-
unattended-upgrades.service
247+
apport-autoreport.service
248+
apport.service
249+
apt-daily-upgrade.service
250+
apt-daily-upgrade.timer
251+
apt-daily.service
252+
apt-daily.timer
253+
atop.service
254+
atopacct.service
255+
autofs.service
256+
bluetooth.target
257+
console-setup.service
258+
crond.service
259+
e2scrub_reap.service
260+
fstrim.service
261+
keyboard-setup
262+
man-db.service
263+
man-db.timer
264+
motd-news.service
265+
motd-news.timer
266+
netplan-ovs-cleanup.service
267+
syslog.service
268+
systemd-journal-flush.service
269+
systemd-pcrphase.service
270+
ua-messaging.service
271+
ua-messaging.timer
272+
ua-reboot-cmds.service
273+
ua-timer.service
274+
ua-timer.timer
275+
ubuntu-advantage.service
276+
unattended-upgrades.service
277+
vgauth.service
278+
open-vm-tools.service
279+
wpa_supplicant.service
280+
lvm2-monitor.service
281+
ModemManager.service
282+
systemd-udev-settle.service
275283
)
284+
276285
# shellcheck disable=SC2048
277286
for SERVICE in ${SERVICES_TO_DISABLE[*]}; do
278287
systemctl stop "${SERVICE}" || true
@@ -287,6 +296,10 @@ rm -rf /tmp/*
287296

288297
echo "📝 disabling the first boot fsck check..."
289298
sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="fsck.mode=skip \1"/g' /etc/default/grub
299+
sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="quiet loglevel=3 systemd.show_status=false rd.udev.log_level=3 libahci.ignore_sss=1 \1"/g' /etc/default/grub
300+
sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="audit=0 \1"/g' /etc/default/grub
301+
sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="rd.lvm=0 rd.luks=0 rd.md=0 rd.dm=0 rd.multipath=0 rd.iscsi=0 rd.plymouth=0 rd.udev.log_priority=3 raid=noautodetect udev.children-max=255 rd.udev.children-max=255 rd.plymouth=0 plymouth.enable=0 \1"/g' /etc/default/grub
302+
290303
update-grub
291304
touch /fastboot
292305

@@ -297,4 +310,6 @@ journalctl --vacuum-time=1s
297310

298311
echo "tmpfs /tmp tmpfs rw,nodev,nosuid,relatime 0 0" >> /etc/fstab
299312

313+
update-alternatives --set iptables /usr/sbin/iptables-legacy
314+
300315
echo "done."

0 commit comments

Comments
 (0)