Fix dockerfile to use cache when building images

p1ass · Oct 26, 2019 · a1edf70 · a1edf70
1 parent 30f59fd
commit a1edf70
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,26 +1,20 @@
-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 && \
         wget https://github.com/lierdakil/pandoc-crossref/releases/download/v0.3.4.1/linux-pandoc_2_7_2.tar.gz && \
         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 → scripts/mdtopdf b/mdtopdf → scripts/mdtopdf
diff --git a/mdtotex → scripts/mdtotex b/mdtotex → scripts/mdtotex
diff --git a/w-mdtopdf → scripts/w-mdtopdf b/w-mdtopdf → scripts/w-mdtopdf
diff --git a/w-mdtotex → scripts/w-mdtotex b/w-mdtotex → scripts/w-mdtotex
diff --git a/watcher → scripts/watcher b/watcher → scripts/watcher