From d728dae390502f0b744f963fdb84d5aadcf2dff2 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 6 Aug 2020 12:17:59 -0600
Subject: Install mono from custom built deb file

* Ensure mono deb job completes successfully
* Sync the CA certificates
---
 Dockerfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index ac5083f..9c175e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,4 @@
 # syntax = docker/dockerfile:experimental
-FROM debian:stable AS mono-builder
-RUN apt-get update -q
-RUN apt-get install --no-install-recommends -y apt-transport-https dirmngr gnupg ca-certificates
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-RUN echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list
-RUN apt-get update -q
-RUN mv /etc/apt/apt.conf.d/docker-clean /etc/apt/apt.conf.d/docker-clean.bak
-RUN apt-get install -y --no-install-recommends nuget referenceassemblies-pcl ca-certificates-mono
-RUN mkdir -p /opt/toolcache && cp /var/cache/apt/archives/*.deb /opt/toolcache/
-
 FROM debian:stable-slim
 ENV ASDF_DATA_DIR="/opt/asdf"
 ENV PATH="${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin:/opt/gitlab/.local/bin:${PATH}"
@@ -16,7 +6,7 @@ ENV TERM="xterm"
 WORKDIR /opt/gitlab
 COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 RUN mkdir -p /opt/toolcache
-COPY --from=mono-builder /opt/toolcache/*.deb /opt/toolcache/mono/
+COPY pkg/mono*.deb /opt/toolcache/
 COPY pkg/license*.deb /opt/toolcache/
 COPY pkg/rust*.deb /opt/toolcache/
 COPY config/install.sh /opt/install.sh
-- 
cgit v1.2.3