From 111c1a0e4ab16310aaac33cbd379a20ae9e018ee Mon Sep 17 00:00:00 2001
From: Mike Farah <mikefarah@gmail.com>
Date: Mon, 20 Sep 2021 11:57:05 +1000
Subject: [PATCH] Fixed docker timeout - simplify docker builds

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c546ed3..b30085c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,11 @@ FROM golang:1.15 as builder
 
 WORKDIR /go/src/mikefarah/yq
 
-# cache devtools
-COPY ./scripts/devtools.sh /go/src/mikefarah/yq/scripts/devtools.sh
-RUN ./scripts/devtools.sh
-
 COPY . /go/src/mikefarah/yq
 
-RUN CGO_ENABLED=0 make local build
+RUN CGO_ENABLED=0 go build .
+RUN ./scripts/test.sh
+RUN ./scripts/acceptance.sh
 
 # Choose alpine as a base image to make this useful for CI, as many
 # CI tools expect an interactive shell inside the container