From 3d8154d87ff9f7233aee031968b728eb0c8dbecb Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 17 Nov 2019 15:24:26 +0100
Subject: [PATCH] Add and use alpine3.8-nginx image

---
 build/build-all.sh                  | 5 ++++-
 doc/existing/list.md                | 8 +++++---
 lxc-apps/ecogis/lxcfile             | 1 +
 lxc-shared/alpine3.8-nginx/lxcfile  | 9 +++++++++
 lxc-shared/alpine3.8-php5.6/lxcfile | 1 +
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 lxc-shared/alpine3.8-nginx/lxcfile

diff --git a/build/build-all.sh b/build/build-all.sh
index e3ac551..2b06896 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -7,7 +7,7 @@ ROOT=$(dirname $(dirname $(realpath "${0}")))
 cd ${ROOT}/doc
 make html
 
-# Build basic.tar
+# Build basic tar
 cd ${ROOT}/vm
 tar cpf /srv/build/vm.tar *
 
@@ -48,16 +48,19 @@ abuild -F
 # Build apd pack runtimes
 cd ${ROOT}/lxc-shared
 lxcbuild alpine3.8
+lxcbuild alpine3.8-nginx
 lxcbuild alpine3.8-php5.6
 lxcbuild alpine3.8-nodejs8
 lxcbuild alpine3.8-ruby2.4
 lxcbuild alpine3.9
+lxcbuild alpine3.9-nginx
 lxcbuild alpine3.9-java8
 lxcbuild alpine3.9-php7.2
 lxcbuild alpine3.9-python2.7
 lxcbuild alpine3.9-python3.6
 lxcbuild alpine3.9-nodejs10
 lxcbuild alpine3.9-ruby2.4
+lxcbuild alpine3.9-ruby2.6
 lxcbuild alpine3.9-tomcat7
 lxcbuild alpine3.9-tomcat8.5
 
diff --git a/doc/existing/list.md b/doc/existing/list.md
index c731d7b..abc7323 100644
--- a/doc/existing/list.md
+++ b/doc/existing/list.md
@@ -5,31 +5,33 @@
 | Layer                   | Container           |
 |-------------------------|---------------------|
 | Alpine 3.8              | alpine3.8           |
+| Alpine 3.8 - nginx      | alpine3.8-nginx     |
 | Alpine 3.8 - PHP 5.6    | alpine3.8-php5.6    |
 | Alpine 3.8 - NodeJS 8   | alpine3.8-nodejs8   |
 | Alpine 3.9 - Ruby 2.4   | alpine3.8-ruby2.4   |
 | Alpine 3.9              | alpine3.9           |
+| Alpine 3.9 - nginx      | alpine3.9-nginx     |
 | Alpine 3.9 - Java 8     | alpine3.9-java8     |
 | Alpine 3.9 - PHP 7.2    | alpine3.9-php7.2    |
 | Alpine 3.9 - Python 2.7 | alpine3.9-python2.7 |
 | Alpine 3.9 - Python 3.6 | alpine3.9-python3.6 |
 | Alpine 3.9 - NodeJS 10  | alpine3.9-nodejs10  |
 | Alpine 3.9 - Ruby 2.4   | alpine3.9-ruby2.4   |
+| Alpine 3.9 - Ruby 2.6   | alpine3.9-ruby2.6   |
 | Alpine 3.9 - Tomcat 7   | alpine3.9-tomcat7   |
 | Alpine 3.9 - Tomcat 8.5 | alpine3.9-tomcat8.5 |
-| Sahana - Shared         | sahana-shared       |
 
 ## List of service containers
 
 | Service         | Container       | UID/GID | Internal Port    |
 |-----------------|-----------------|---------|------------------|
 | ActiveMQ        | activemq        | 61616   | 61616 (ActiveMQ) |
-| CKAN Datapusher | ckan-datapusher | 8080    | 8080 (HTTP)      |
 | MariaDB         | mariadb         | 3306    | 3306 (MySQL)     |
 | Postgres        | postgres        | 5432    | 5432 (Postgres)  |
+| PostGIS         | postgis         | 5432    | 5432 (Postgres)  |
 | RabbitMQ        | rabbitmq        | 5672    | 5672 (AMQP)      |
 | Redis           | redis           | 6379    | 6379 (Redis)     |
-| Solr            | solr            | 8983    | 8983 (HTTP)      |
+| Solr 6          | solr6           | 8983    | 8983 (HTTP)      |
 
 ## List of application containers
 
diff --git a/lxc-apps/ecogis/lxcfile b/lxc-apps/ecogis/lxcfile
index 692f084..a496843 100644
--- a/lxc-apps/ecogis/lxcfile
+++ b/lxc-apps/ecogis/lxcfile
@@ -1,6 +1,7 @@
 IMAGE ecogis_0.0.1-190620
 
 LAYER alpine3.8_3.8.4-190620
+LAYER alpine3.8-nginx_1.14.2-191115
 LAYER alpine3.8-php5.6_5.6.40-190620
 
 RUN EOF
diff --git a/lxc-shared/alpine3.8-nginx/lxcfile b/lxc-shared/alpine3.8-nginx/lxcfile
new file mode 100644
index 0000000..4e629d1
--- /dev/null
+++ b/lxc-shared/alpine3.8-nginx/lxcfile
@@ -0,0 +1,9 @@
+IMAGE alpine3.8-nginx_1.14.2-191115
+
+LAYER alpine3.8_3.8.4-190620
+
+RUN EOF
+    apk --no-cache add nginx
+EOF
+
+CMD nginx -g "daemon off;"
diff --git a/lxc-shared/alpine3.8-php5.6/lxcfile b/lxc-shared/alpine3.8-php5.6/lxcfile
index 6b71f73..5e99292 100644
--- a/lxc-shared/alpine3.8-php5.6/lxcfile
+++ b/lxc-shared/alpine3.8-php5.6/lxcfile
@@ -1,6 +1,7 @@
 IMAGE alpine3.8-php5.6_5.6.40-190620
 
 LAYER alpine3.8_3.8.4-190620
+LAYER alpine3.8-nginx_1.14.2-191115
 
 RUN EOF
     apk --no-cache add nginx php5 php5-ctype php5-fpm php5-gd php5-json php5-mcrypt php5-opcache