From 2e674aa2d00742860da61600222bb557ca627784 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 3 Oct 2019 20:08:37 +0200 Subject: [PATCH] Update build-all.sh --- apk/vmmgr | 2 +- build/build-all.sh | 134 ++++++++++++------------------------- doc/toolchain/lxc-build.md | 10 --- 3 files changed, 43 insertions(+), 103 deletions(-) diff --git a/apk/vmmgr b/apk/vmmgr index ae2a913..6045349 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit ae2a913d0ca05422a1f070c27c4057119177ab8d +Subproject commit 6045349f9c3602d6ba9b081a62d4338b202521d6 diff --git a/build/build-all.sh b/build/build-all.sh index 986de40..143025d 100755 --- a/build/build-all.sh +++ b/build/build-all.sh @@ -47,101 +47,51 @@ abuild -F # Build apd pack runtimes cd ${ROOT}/lxc-shared -lxc-build alpine3.8 -lxc-build alpine3.8-php5.6 -lxc-build alpine3.8-nodejs8 -lxc-build alpine3.8-ruby2.4 -lxc-build alpine3.9 -lxc-build alpine3.9-java8 -lxc-build alpine3.9-php7.2 -lxc-build alpine3.9-python2.7 -lxc-build alpine3.9-python3.6 -lxc-build alpine3.9-nodejs10 -lxc-build alpine3.9-ruby2.4 -lxc-build alpine3.9-tomcat7 -lxc-build alpine3.9-tomcat8.5 +lxcbuild alpine3.8 +lxcbuild alpine3.8-php5.6 +lxcbuild alpine3.8-nodejs8 +lxcbuild alpine3.8-ruby2.4 +lxcbuild alpine3.9 +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-tomcat7 +lxcbuild alpine3.9-tomcat8.5 # Build services cd ${ROOT}/lxc-services -lxc-build activemq -lxc-build mariadb -lxc-build postgres -lxc-build postgis -lxc-build rabbitmq -lxc-build redis -lxc-build solr +lxcbuild activemq +lxcbuild mariadb +lxcbuild postgres +lxcbuild postgis +lxcbuild rabbitmq +lxcbuild redis +lxcbuild solr6 # Build applications cd ${ROOT}/lxc-apps -lxc-build ckan -lxc-build ckan-datapusher -lxc-build crisiscleanup -lxc-build cts -lxc-build ecogis -lxc-build frontlinesms -lxc-build gnuhealth -lxc-build kanboard -lxc-build mifosx -lxc-build motech -lxc-build odoo -lxc-build opendatakit -lxc-build opendatakit-build -lxc-build openmapkit -lxc-build pandora -lxc-build sahana-shared -lxc-build sahana -lxc-build sahana-demo -lxc-build sambro -lxc-build seeddms -lxc-build sigmah -lxc-build ushahidi - -# Pack runtimes -cd ${ROOT}/lxc-shared -lxc-pack alpine3.8 -lxc-pack alpine3.8-php5.6 -lxc-pack alpine3.8-nodejs8 -lxc-pack alpine3.8-ruby2.4 -lxc-pack alpine3.9 -lxc-pack alpine3.9-java8 -lxc-pack alpine3.9-php7.2 -lxc-pack alpine3.9-python2.7 -lxc-pack alpine3.9-python3.6 -lxc-pack alpine3.9-nodejs10 -lxc-pack alpine3.9-ruby2.4 -lxc-pack alpine3.9-tomcat7 -lxc-pack alpine3.9-tomcat8.5 - -# Pack services -cd ${ROOT}/lxc-services -lxc-pack activemq -lxc-pack mariadb -lxc-pack postgres -lxc-pack rabbitmq -lxc-pack redis -lxc-pack solr - -# Pack applications -cd ${ROOT}/lxc-apps -lxc-pack ckan-datapusher -lxc-pack ckan -lxc-pack crisiscleanup -lxc-pack cts -lxc-pack ecogis -lxc-pack frontlinesms -lxc-pack gnuhealth -lxc-pack kanboard -lxc-pack mifosx -lxc-pack motech -lxc-pack odoo -lxc-pack opendatakit -lxc-pack opendatakit-build -lxc-pack openmapkit -lxc-pack pandora -lxc-pack sahana-shared -lxc-pack sahana -lxc-pack sahana-demo -lxc-pack sambro -lxc-pack seeddms -lxc-pack sigmah -lxc-pack ushahidi +lxcbuild ckan +lxcbuild ckan-datapusher +lxcbuild crisiscleanup +lxcbuild cts +lxcbuild ecogis +lxcbuild frontlinesms +lxcbuild gnuhealth +lxcbuild kanboard +lxcbuild mifosx +lxcbuild motech +lxcbuild odoo +lxcbuild opendatakit +lxcbuild opendatakit-build +lxcbuild openmapkit +lxcbuild pandora +lxcbuild sahana-shared +lxcbuild sahana +lxcbuild sahana-demo +lxcbuild sambro +lxcbuild seeddms +lxcbuild sigmah +lxcbuild ushahidi diff --git a/doc/toolchain/lxc-build.md b/doc/toolchain/lxc-build.md index 76aae4a..835d38d 100644 --- a/doc/toolchain/lxc-build.md +++ b/doc/toolchain/lxc-build.md @@ -82,13 +82,6 @@ The *lxcfile* syntax is designed to resemble *Dockerfile* syntax in order to eas - **Docker equivalent:** `COPY` or `ADD` - **Populates LXC field:** None -### MOUNT - -- **Usage:** `MOUNT DIR|FILE ` -- **Description:** Creates a directory or file mount for the container. The `` is usually given as absolute path existing on the LXC host, the `` is a path relative to the container root directory. If the file doesn't exist in any of the container layers, it is automatically created on container startup. -- **Docker equivalent:** `VOLUME` -- **Populates LXC field:** `lxc.mount.entry` - ### USER - **Usage:** `USER ` @@ -192,9 +185,6 @@ RUN EOF apk --no-cache add redis EOF -MOUNT FILE /srv/redis/conf/redis.conf etc/redis.conf -MOUNT DIR /srv/redis/data var/lib/redis - USER 6379 6379 CMD redis-server /etc/redis.conf ```