From ba019c52a4e9a5697d33fe84e70db0ccb5aa7cae Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Mon, 11 May 2020 10:57:59 -0400
Subject: [PATCH] Try using new build image.

---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4c3a5bd..f7a5965f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,17 @@
+variables:
+  CI_BUILD_IMAGE: $CI_REGISTRY_IMAGE/zmk-build
 
 build:
-  image: zephyrprojectrtos/zephyr-build
+  image: $CI_BUILD_IMAGE
+
+  variables:
+    GIT_CLONE_PATH: $CI_BUILD_DIR/zmk
 
   before_script:
     - west init -l .
     - west update
     - west config --global zephyr.base-prefer configfile
     - west zephyr-export
-    - pip3 install --user -r ../zephyr/scripts/requirements.txt
 
   script:
     - west build -b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire
@@ -18,13 +22,10 @@ build:dockerimage:
 
   image: docker:stable
 
-  variables:
-    CI_BUILD_IMAGE: $CI_REGISTRY_IMAGE/zmk-build
 
   before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-
   script:
     - docker pull $CI_BUILD_IMAGE:latest || true
     - docker build --cache-from $CI_BUILD_IMAGE:latest -t $CI_BUILD_IMAGE:latest .