Skip to content

Commit e167bb7

Browse files
committed
Fixup possible incorrect line endings in the start script
1 parent 9a285f4 commit e167bb7

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

compute.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ resource "google_compute_project_metadata_item" "startup_scripts_register_jit_ru
8282
#!/bin/bash
8383
agent_name=$(hostname)
8484
echo "Setup of agent '$agent_name' started"
85-
apt-get update && apt-get -y install docker.io docker-buildx curl jq ${local.github_runner_package_install}
85+
apt-get update && apt-get -y install docker.io docker-buildx curl sed jq ${local.github_runner_package_install}
8686
useradd -d /home/agent -u ${var.github_runner_uid} agent
8787
usermod -aG docker agent
8888
newgrp docker

runner-autoscaler/pkg/srv.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ const runner_script_wrapper = `
523523
#!/bin/bash
524524
val=$(curl "http://metadata.google.internal/computeMetadata/v1/instance/attributes/%s" -H "Metadata-Flavor: Google")
525525
curl "http://metadata.google.internal/computeMetadata/v1/project/attributes/%s" -H "Metadata-Flavor: Google" > runner_startup.sh
526+
sed -i 's/\r$//' ./runner_startup.sh
526527
chmod +x ./runner_startup.sh
527528
./runner_startup.sh $val
528529
rm runner_startup.sh

version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# used to tag the docker image of autoscaler. Should be incremented every time the autoscaler code is changed.
22
locals {
3-
autoscaler_version = "1.0.0-snapshot"
3+
autoscaler_version = "1.0.1-snapshot"
44
}

0 commit comments

Comments
 (0)