From f2170f4955a3eda0fac84b694073e167f400b9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=BChnel?= <kuhnel@google.com>
Date: Fri, 17 Jan 2020 11:52:31 +0000
Subject: [PATCH] updated buildkite windows

---
 containers/agent-windows-buildkite/Dockerfile | 32 ++++++++-----------
 .../agent-windows-buildkite/start_agent.ps1   |  6 ++++
 2 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 containers/agent-windows-buildkite/start_agent.ps1

diff --git a/containers/agent-windows-buildkite/Dockerfile b/containers/agent-windows-buildkite/Dockerfile
index 5f17fb4..d2c3c13 100644
--- a/containers/agent-windows-buildkite/Dockerfile
+++ b/containers/agent-windows-buildkite/Dockerfile
@@ -1,18 +1,14 @@
-# escape=`
-
-# use windows server core image
-FROM gcr.io/llvm-premerge-checks/agent-windows
-
-# install buildkite agent as described in the documentation
-# https://buildkite.com/docs/agent/v3/windows
-# Supply your agent token via the arguement "-token <mytoken" when building the image
-ARG token
-ENV buildkiteAgentToken="${token}"
-ENV BUILDKITE_BUILD_PATH=C:\ws\bk
-ENV BUILDKITE_AGENT_NAME=win-vs17
-
-RUN powershell -NoProfile -InputFormat None -Command `
-    Set-ExecutionPolicy Bypass -Scope Process -Force ; `
-    iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1'))
-
-CMD "C:\buildkite-agent\bin\buildkite-agent.exe" start 
\ No newline at end of file
+# escape=`
+
+# use windows server core image
+FROM gcr.io/llvm-premerge-checks/agent-windows
+
+# install buildkite agent as described in the documentation
+# https://buildkite.com/docs/agent/v3/windows
+# Supply your agent token via the arguement "-token <mytoken" when building the image
+ARG token
+ENV BUILDKITE_BUILD_PATH=C:\ws\bk
+ENV BUILDKITE_AGENT_NAME=win-vs17
+
+COPY start_agent.ps1 C:\scripts\
+CMD "powershell C:\scripts\start_agent.ps1"
\ No newline at end of file
diff --git a/containers/agent-windows-buildkite/start_agent.ps1 b/containers/agent-windows-buildkite/start_agent.ps1
new file mode 100644
index 0000000..0b02057
--- /dev/null
+++ b/containers/agent-windows-buildkite/start_agent.ps1
@@ -0,0 +1,6 @@
+$Env:buildkiteAgentToken = [IO.File]::ReadAllText("C:\credentials\buildkite-token.txt")
+
+#Set-ExecutionPolicy Bypass -Scope Process -Force 
+iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1'))
+
+C:\buildkite-agent\bin\buildkite-agent.exe start --tags "os=windows"
\ No newline at end of file