From d2676bbfb88fd96c693ade9b6f2235fac87c0015 Mon Sep 17 00:00:00 2001
From: "Christopher A. Mosher" <cmosher01@gmail.com>
Date: Thu, 16 Jul 2015 00:12:41 -0400
Subject: [PATCH] dist/download; colorize gcc log; use version attrib in doc;
 web compose conf

---
 Dockerfile             | 10 +++++++++-
 config.site            |  1 +
 doc/Makefile.am        |  2 +-
 doc/download.asciidoc  |  4 +---
 docker-compose-web.yml |  6 ++++++
 5 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 config.site
 create mode 100644 docker-compose-web.yml

diff --git a/Dockerfile b/Dockerfile
index 89a5def..628fa9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,12 +26,15 @@ WORKDIR /root/
 
 
 
+COPY config.site  /usr/local/share/
+
 COPY bootstrap ./
 
 COPY NEWS ./
 COPY README ./
 COPY AUTHORS ./
 COPY ChangeLog ./
+COPY COPYING* ./
 
 COPY configure.ac ./
 
@@ -51,11 +54,16 @@ RUN ./bootstrap 2>&1 | tee -a $BUILD_LOG
 RUN ./configure 2>&1 | tee -a $BUILD_LOG
 RUN make 2>&1 | tee -a $BUILD_LOG
 RUN make check 2>&1 | tee -a $BUILD_LOG
+RUN make dist 2>&1 | tee -a $BUILD_LOG
+RUN make distcheck 2>&1 | tee -a $BUILD_LOG
 RUN make install 2>&1 | tee -a $BUILD_LOG
 RUN make html 2>&1 | tee -a $BUILD_LOG
 RUN make install-html 2>&1 | tee -a $BUILD_LOG
+RUN make installcheck 2>&1 | tee -a $BUILD_LOG
 
-
+RUN mkdir /usr/local/share/doc/epple2/download && \
+    cd /usr/local/share/doc/epple2/download && \
+    ln -s ~/epple2-*.tar.gz
 
 
 
diff --git a/config.site b/config.site
new file mode 100644
index 0000000..8d1b452
--- /dev/null
+++ b/config.site
@@ -0,0 +1 @@
+test -z "$CXXFLAGS" && CXXFLAGS=-fdiagnostics-color=always
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8fb9143..5e95002 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 SUFFIXES = .asciidoc .html
 
 .asciidoc.html :
-	asciidoc -b html5 $<
+	asciidoc -b html5 -a VERSION=@VERSION@ $<
 
 
 
diff --git a/doc/download.asciidoc b/doc/download.asciidoc
index f67ab5f..1d727e0 100644
--- a/doc/download.asciidoc
+++ b/doc/download.asciidoc
@@ -14,14 +14,12 @@ are available at the http://mosher.mine.nu/apple2/[Apple II Library].
 The following software is licensed under
 http://www.gnu.org/licenses/gpl-3.0-standalone.html[GPLv3].
 
-Epple ][ Program:: http://mosher.mine.nu/epple2/download/epple2-latest.tar.gz[epple2.tar.gz]
-ROMs (System Demo and Cards):: http://mosher.mine.nu/epple2/download/epple2sys-latest.tar.gz[epple2sys.tar.gz]
+Epple ][ Program:: link:download/epple2-{VERSION}.tar.gz[epple2-{VERSION}.tar.gz]
 
 See <<_building_from_source,Building>> on how to build from sources.
 
 Source code is hosted on github:
 https://github.com/cmosher01/Epple-II/[Epple-II]
-https://github.com/cmosher01/Epple-II-ROM/[Epple-II-ROM]
 
 
 == What To Download
diff --git a/docker-compose-web.yml b/docker-compose-web.yml
new file mode 100644
index 0000000..9970411
--- /dev/null
+++ b/docker-compose-web.yml
@@ -0,0 +1,6 @@
+---
+epple2:
+  build: .
+  command: -c web
+  ports:
+    - "8080:80"