From 9faba0f9e6e624b48661f21053063094975a9521 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 2 Oct 2019 16:55:00 +0000
Subject: [PATCH 1/2] Update Dockerfile

---
 gitlab-shell/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitlab-shell/Dockerfile b/gitlab-shell/Dockerfile
index 3b501a4e4..4ad0b3323 100644
--- a/gitlab-shell/Dockerfile
+++ b/gitlab-shell/Dockerfile
@@ -26,7 +26,7 @@ RUN mkdir /srv/gitlab-shell && \
     curl --header "PRIVATE-TOKEN: ${FETCH_ARTIFACTS_PAT}" -o gitlab-shell.tar.bz2 "${CI_API_V4_URL}/projects/${GITLAB_NAMESPACE}%2Fgitlab-shell/repository/archive.tar.bz2?sha=${GITLAB_SHELL_VERSION}" && \
     tar -xjf gitlab-shell.tar.bz2 --strip-components=1 && \
     rm gitlab-shell.tar.bz2 && \
-    ./bin/compile && \
+    make build && \
     rm -rf go go_build
 
 FROM ${FROM_IMAGE}:${TAG}
-- 
GitLab


From 3f3f4a1827eebbf9d4a430b143e87ddf00f3ed01 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Thu, 3 Oct 2019 10:11:49 +0000
Subject: [PATCH 2/2] Add make as a build-dep

---
 gitlab-shell/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitlab-shell/Dockerfile b/gitlab-shell/Dockerfile
index 4ad0b3323..2a33aa24b 100644
--- a/gitlab-shell/Dockerfile
+++ b/gitlab-shell/Dockerfile
@@ -12,7 +12,7 @@ ARG CI_API_V4_URL
 
 # install build deps
 RUN buildDeps=' \
-    gcc' \
+    gcc make' \
     && apt-get update \
     && apt-get install -y --no-install-recommends $buildDeps \
     && rm -rf /var/lib/apt/lists/* \
-- 
GitLab