From 23a9a403aadf6b5fe34b474b9f21edbf98de38b3 Mon Sep 17 00:00:00 2001
From: Matthew Kastin <matthew.kastin@sas.com>
Date: Thu, 21 Oct 2021 22:49:49 -0400
Subject: [PATCH] fix recipe builder issues

* issue with certificates from gopkg.in\n* latest Docker client v20 not compatible with go 1.14 because of io/ioutils deprecation in go 1.16\n* setup go module and pin dependency versions
---
 Dockerfile |  9 +++++----
 go.mod     | 11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 go.mod

diff --git a/Dockerfile b/Dockerfile
index 04a1684..2f2f693 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,14 +4,13 @@ FROM golang:1.14.0
 
 ARG USER_UID=1000
 ARG DOCKER_GID=997
+ARG DOCKER_VERSION=v20.10.8+incompatible
 
 RUN apt-get update && \
+    apt-get install -y --reinstall ca-certificates libgnutls30 && \ 
     apt-get install -y openjdk-11-jdk-headless ansible && \
     rm -rf /var/lib/apt/lists/*
 
-# We need to use dep or go mod to handle deps.
-RUN go get -x -u gopkg.in/yaml.v2 github.com/docker/docker/api/types github.com/docker/docker/client
-
 RUN groupadd --gid ${DOCKER_GID} docker
 RUN useradd --uid ${USER_UID} \
     --gid ${DOCKER_GID} \
@@ -27,11 +26,13 @@ COPY --chown=sas:docker addons ./addons
 COPY --chown=sas:docker samples ./samples
 COPY --chown=sas:docker tests ./tests
 COPY --chown=sas:docker util ./util
-COPY --chown=sas:docker *.yml *.go ./
+COPY --chown=sas:docker *.yml *.go go.mod ./
 COPY --chown=sas:docker util/sas-orchestration ./util/programming-only-single/sas-orchestration
 
 RUN chown -R ${USER_GID}:${DOCKER_GID} /sas-container-recipes
 
 USER sas
 
+RUN go mod download
+
 ENTRYPOINT ["/usr/local/go/bin/go", "run", "main.go", "container.go", "order.go"]
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..b7ae895
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,11 @@
+module github.com/sas/sas-container-recipes
+
+go 1.14
+
+require (
+        github.com/containerd/containerd v1.5.7 // indirect
+        github.com/docker/docker v20.10.8+incompatible
+        github.com/docker/go-connections v0.4.0 // indirect
+        google.golang.org/grpc v1.41.0 // indirect
+        gopkg.in/yaml.v2 v2.4.0
+)