Merge branch 'master' into job-update

angad777 · Oct 23, 2018 · 0ee861b · 0ee861b
2 parents 04bc0c8 + c4434cb
commit 0ee861b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,25 +3,25 @@ GEM
   specs:
     arr-pm (0.0.10)
       cabin (> 0)
-    aws-sdk (2.10.117)
-      aws-sdk-resources (= 2.10.117)
-    aws-sdk-core (2.10.117)
+    aws-sdk (2.11.152)
+      aws-sdk-resources (= 2.11.152)
+    aws-sdk-core (2.11.152)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.117)
-      aws-sdk-core (= 2.10.117)
-    aws-sigv4 (1.0.2)
-    backports (3.11.0)
+    aws-sdk-resources (2.11.152)
+      aws-sdk-core (= 2.11.152)
+    aws-sigv4 (1.0.3)
+    backports (3.11.4)
     cabin (0.9.0)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     clamp (1.0.1)
-    deb-s3 (0.9.1)
+    deb-s3 (0.10.0)
       aws-sdk (~> 2)
       thor (~> 0.19.0)
-    dotenv (2.2.1)
-    ffi (1.9.18)
-    fpm (1.9.3)
+    dotenv (2.5.0)
+    ffi (1.9.25)
+    fpm (1.10.2)
       arr-pm (~> 0.0.10)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
@@ -30,11 +30,11 @@ GEM
       ffi
       json (>= 1.7.7, < 2.0)
       pleaserun (~> 0.0.29)
-      ruby-xz
+      ruby-xz (~> 0.2.3)
       stud
     insist (1.0.0)
     io-like (0.3.0)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     json (1.8.6)
     mustache (0.99.8)
     pleaserun (0.0.30)
@@ -58,4 +58,4 @@ DEPENDENCIES
   fpm
 
 BUNDLED WITH
-   1.15.4
+   1.16.5
diff --git a/agent/agent_worker.go b/agent/agent_worker.go
@@ -14,6 +14,12 @@ import (
 )
 
 type AgentWorker struct {
+	// Tracks the last successful heartbeat and ping
+	// NOTE: to avoid alignment issues on ARM architectures when
+	// using atomic.StoreInt64 we need to keep this at the beginning
+	// of the struct
+	lastPing, lastHeartbeat int64
+
 	// The API Client used when this agent is communicating with the API
 	APIClient *api.Client
 
@@ -43,9 +49,6 @@ type AgentWorker struct {
 	// When this worker runs a job, we'll store an instance of the
 	// JobRunner here
 	jobRunner *JobRunner
-
-	// Tracks the last successful heartbeat and ping
-	lastPing, lastHeartbeat int64
 }
 
 // Creates the agent worker and initializes it's API Client

diff --git a/packaging/docker/alpine-linux/Dockerfile b/packaging/docker/alpine-linux/Dockerfile
@@ -19,7 +19,8 @@ RUN apk add --no-cache \
     pip install --upgrade pip && \
     pip install docker-compose
 
-ENV BUILDKITE_BUILD_PATH=/buildkite/builds \
+ENV BUILDKITE_AGENT_CONFIG=/buildkite/buildkite-agent.cfg \
+    BUILDKITE_BUILD_PATH=/buildkite/builds \
     BUILDKITE_HOOKS_PATH=/buildkite/hooks \
     BUILDKITE_PLUGINS_PATH=/buildkite/plugins
 

diff --git a/packaging/docker/ubuntu-linux/Dockerfile b/packaging/docker/ubuntu-linux/Dockerfile
@@ -20,7 +20,8 @@ RUN curl -Lfs -o /sbin/tini  https://github.com/krallin/tini/releases/download/v
     && curl -Lfs https://github.com/docker/compose/releases/download/1.21.0/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose \
     && chmod +x /usr/local/bin/docker-compose
 
-ENV BUILDKITE_BUILD_PATH=/buildkite/builds \
+ENV BUILDKITE_AGENT_CONFIG=/buildkite/buildkite-agent.cfg \
+    BUILDKITE_BUILD_PATH=/buildkite/builds \
     BUILDKITE_HOOKS_PATH=/buildkite/hooks \
     BUILDKITE_PLUGINS_PATH=/buildkite/plugins \
     PATH="/usr/local/bin:${PATH}"