From a1edf70b3ffa85159498223d77690462a48cd9c3 Mon Sep 17 00:00:00 2001
From: Naoki Kishi <naokikishi.kyoto@gmail.com>
Date: Sun, 27 Oct 2019 01:40:19 +0900
Subject: [PATCH] Fix dockerfile to use cache when building images

---
 Dockerfile                     | 16 +++++-----------
 mdtopdf => scripts/mdtopdf     |  0
 mdtotex => scripts/mdtotex     |  0
 w-mdtopdf => scripts/w-mdtopdf |  0
 w-mdtotex => scripts/w-mdtotex |  0
 watcher => scripts/watcher     |  0
 6 files changed, 5 insertions(+), 11 deletions(-)
 rename mdtopdf => scripts/mdtopdf (100%)
 rename mdtotex => scripts/mdtotex (100%)
 rename w-mdtopdf => scripts/w-mdtopdf (100%)
 rename w-mdtotex => scripts/w-mdtotex (100%)
 rename watcher => scripts/watcher (100%)

diff --git a/Dockerfile b/Dockerfile
index 86fcfd1..8ee4610 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,11 @@
-FROM ubuntu
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ADD mdtopdf /usr/local/bin
-ADD mdtotex /usr/local/bin
-ADD watcher /usr/local/bin
-ADD w-mdtopdf /usr/local/bin
-ADD w-mdtotex /usr/local/bin
-ADD crossref_config.yaml /config/crossref_config.yaml
-
 RUN apt update && \
-		apt upgrade -y && \
 		apt install wget texlive-luatex texlive-lang-cjk lmodern texlive-xetex -y && \
-                apt-get clean
+                apt-get clean && \
+                rm -rf /var/lib/apt/lists/*
 
 RUN wget https://github.com/jgm/pandoc/releases/download/2.7.2/pandoc-2.7.2-1-amd64.deb && \
         dpkg -i pandoc-2.7.2-1-amd64.deb && \
@@ -20,7 +13,8 @@ RUN wget https://github.com/jgm/pandoc/releases/download/2.7.2/pandoc-2.7.2-1-am
         tar -zxvf linux-pandoc_2_7_2.tar.gz && \
         mv pandoc-crossref /usr/local/bin
 
-
+COPY scripts/ /usr/local/bin/
+COPY crossref_config.yaml /config/crossref_config.yaml
 
 VOLUME /workdir
 WORKDIR /workdir
diff --git a/mdtopdf b/scripts/mdtopdf
similarity index 100%
rename from mdtopdf
rename to scripts/mdtopdf
diff --git a/mdtotex b/scripts/mdtotex
similarity index 100%
rename from mdtotex
rename to scripts/mdtotex
diff --git a/w-mdtopdf b/scripts/w-mdtopdf
similarity index 100%
rename from w-mdtopdf
rename to scripts/w-mdtopdf
diff --git a/w-mdtotex b/scripts/w-mdtotex
similarity index 100%
rename from w-mdtotex
rename to scripts/w-mdtotex
diff --git a/watcher b/scripts/watcher
similarity index 100%
rename from watcher
rename to scripts/watcher