From c3f58835b5f52bdc3b0bdc9198e93d264ab14d44 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Fri, 3 Nov 2017 21:20:34 +0000
Subject: [PATCH] Actually use fonts, minimize build a bit

---
 Dockerfile.moth         | 17 +++++++----------
 Dockerfile.moth-devel   |  5 +----
 www/fonts/maven_pro.css |  2 --
 www/style.css           |  3 +--
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Dockerfile.moth b/Dockerfile.moth
index bf7f5ee..ac5b9d9 100644
--- a/Dockerfile.moth
+++ b/Dockerfile.moth
@@ -1,17 +1,14 @@
 FROM neale/eris
 
-RUN apk --no-cache add lua5.2
-RUN apk --no-cache add lua5.3
+RUN apk --no-cache add lua5.2 lua5.3
 RUN ln -s lua5.2 /usr/bin/lua
 
 # Install MOTH. This could be less obtuse.
-COPY www /moth/www
-COPY bin /moth/bin
-RUN ln -s ../state/puzzles.json /moth/www/puzzles.json
-RUN ln -s ../state/points.json /moth/www/points.json
+COPY www /moth/www/
+COPY bin /moth/bin/
+COPY src/moth-init /moth/init
+RUN ln -s ../state/puzzles.json /moth/www/puzzles.json && \
+    ln -s ../state/points.json /moth/www/points.json
 
-COPY src/moth-init /usr/sbin/moth-init
-
-WORKDIR /
-CMD ["/usr/sbin/moth-init"]
+CMD ["/moth/init"]
 
diff --git a/Dockerfile.moth-devel b/Dockerfile.moth-devel
index 4d5f214..4e94dfa 100644
--- a/Dockerfile.moth-devel
+++ b/Dockerfile.moth-devel
@@ -5,10 +5,7 @@ ENV http_proxy=${http_proxy}
 
 RUN apk --no-cache add python3 py3-pillow
 
-COPY tools/devel-server.py /moth/
-COPY tools/moth.py /moth/
-COPY tools/mistune.py /moth/
-COPY tools/answer_words.txt /moth/
+COPY tools/devel-server.py tools/moth.py tools/mistune.py tools/answer_words.txt /moth/
 COPY www /moth/src/www
 COPY example-puzzles /moth/puzzles
 COPY docs /moth/docs
diff --git a/www/fonts/maven_pro.css b/www/fonts/maven_pro.css
index 32cd48c..b55184e 100755
--- a/www/fonts/maven_pro.css
+++ b/www/fonts/maven_pro.css
@@ -1,4 +1,3 @@
-/*
 @font-face {
     font-family: 'Maven Pro';
     src: url('maven_pro_black-webfont.eot');
@@ -10,7 +9,6 @@
     font-style: normal;
 
 }
-/*
 
 @font-face {
     font-family: 'Maven Pro';
diff --git a/www/style.css b/www/style.css
index ccbef54..3957a96 100644
--- a/www/style.css
+++ b/www/style.css
@@ -172,9 +172,8 @@ nav li + li:before {
 }
 
 #sponsors img {
-	max-width: 33%;
+	max-width: 25%;
 	max-height: 5em;
-	margin: 1em;
 }