From 2f60386b519f605e818977eee33983b0acb28f8e Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@rstudio.com>
Date: Mon, 22 Jun 2020 23:45:43 -0400
Subject: [PATCH] Use official pandoc image instead

---
 .github/workflows/main.yml |  1 -
 Makefile                   |  7 +---
 docs/Dockerfile            | 81 --------------------------------------
 3 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 docs/Dockerfile

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 25c77ec2..9e3da039 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -131,7 +131,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - run: make docs-image
     - run: make docs-build
     - uses: actions/upload-artifact@v2
       with:
diff --git a/Makefile b/Makefile
index b9cc600c..e7611bd9 100644
--- a/Makefile
+++ b/Makefile
@@ -106,17 +106,12 @@ ifeq (Linux,$(shell uname))
 	DOCKER_RUN_AS = -u $(shell id -u):$(shell id -g)
 endif
 
-DOCS_IMAGE := rsconnect-jupyter-docs:local
 BUILD_DOC := docker run --rm=true $(DOCKER_RUN_AS) \
 	-e VERSION=$(VERSION) \
 	$(DOCKER_ARGS) \
 	-v $(CURDIR):/rsconnect_jupyter \
 	-w /rsconnect_jupyter \
-	$(DOCS_IMAGE) docs/build-doc.sh
-
-.PHONY: docs-image
-docs-image:
-	docker build -t $(DOCS_IMAGE) ./docs
+	pandoc/latex:2.9 docs/build-doc.sh
 
 .PHONY: docs-build
 docs-build: docs/out
diff --git a/docs/Dockerfile b/docs/Dockerfile
deleted file mode 100644
index 9f41af29..00000000
--- a/docs/Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-# Using dated tags from https://hub.docker.com/_/ubuntu/
-FROM ubuntu:trusty-20180420
-MAINTAINER RStudio Connect <rsconnect@rstudio.com>
-
-ARG AWS_REGION=us-east-1
-
-# Use EC2 (Cloudfront) apt source instead of default redirecting mirror.
-RUN set -x \
-    && sed -i "s/archive.ubuntu.com/$AWS_REGION.ec2.archive.ubuntu.com/" /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get update
-
-# Install packages aside from R and TeX (because they are large)
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y \
-    git \
-    libcurl4-gnutls-dev \
-    libssl-dev \
-    libxml2-dev \
-    make \
-    curl && \
-    rm -rf /var/lib/apt/lists/*
-
-# First install some non-texlive packages which are recommended but will be skipped when we install texlive
-# in order to not install the documentation.
-#
-# biber depends on libwww-perl which has a tree of recommended packages, and recommends libreadonly-xs-perl
-# texlive-base depends on xdg-utils which has a tree of recommended packages
-# texinfo depends upon libxml-libxml-perl which has a tree of recommended packages
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y \
-    libreadonly-xs-perl \
-    libwww-perl \
-    libxml-libxml-perl \
-    ruby \
-    tcl \
-    tk \
-    xdg-utils && \
-    rm -rf /var/lib/apt/lists/*
-
-# First part of texlive itself. Use --no-install-recommends to avoid installing ~750MB of documentation
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-    texlive \
-    texlive-fonts-extra \
-    texlive-generic-recommended && \
-    rm -rf /var/lib/apt/lists/*
-
-# Second part of texlive itself. Use --no-install-recommends to avoid installing ~750MB of documentation
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-    biber \
-    latex-beamer \
-    lmodern \
-    prosper \
-    ps2eps \
-    tex-gyre \
-    texinfo \
-    texlive-bibtex-extra \
-    texlive-extra-utils \
-    texlive-font-utils \
-    texlive-latex-extra \
-    texlive-luatex \
-    texlive-pstricks \
-    texlive-xetex && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install pre-compiled pandoc
-# Inspired by /connect/dependencies/install-pandoc
-RUN export PANDOC_VERSION=2.1.3 && \
-    cd /usr/local/bin && \
-    curl -L -O https://s3.amazonaws.com/rstudio-buildtools/pandoc/${PANDOC_VERSION}/linux-64/pandoc.gz && \
-    curl -L -O https://s3.amazonaws.com/rstudio-buildtools/pandoc/${PANDOC_VERSION}/linux-64/pandoc-citeproc.gz && \
-    gzip -d pandoc.gz pandoc-citeproc.gz && \
-    chmod 0755 pandoc pandoc-citeproc
-
-WORKDIR /rsconnect_jupyter