From 26075bad79928d0a673db530547faad3f190ce07 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 5 Sep 2018 17:46:44 +0200 Subject: [PATCH] CRLF --- basic-runtimes/alpine.lxcfile | 10 +++++----- basic-runtimes/java.lxcfile | 12 ++++++------ basic-runtimes/libxml.lxcfile | 12 ++++++------ basic-runtimes/php.lxcfile | 12 ++++++------ basic-runtimes/python2.lxcfile | 14 +++++++------- basic-runtimes/python3.lxcfile | 16 ++++++++-------- build-all.sh | 3 +++ 7 files changed, 41 insertions(+), 38 deletions(-) diff --git a/basic-runtimes/alpine.lxcfile b/basic-runtimes/alpine.lxcfile index d0a130f..cddc190 100644 --- a/basic-runtimes/alpine.lxcfile +++ b/basic-runtimes/alpine.lxcfile @@ -1,5 +1,5 @@ -LAYER shared/alpine - -SCRIPT - apk --no-cache add s6 -RUN +LAYER shared/alpine + +SCRIPT + apk --no-cache add s6 +RUN diff --git a/basic-runtimes/java.lxcfile b/basic-runtimes/java.lxcfile index f9579c1..3214421 100644 --- a/basic-runtimes/java.lxcfile +++ b/basic-runtimes/java.lxcfile @@ -1,6 +1,6 @@ -LAYER shared/alpine -LAYER shared/java - -SCRIPT - apk --no-cache add openjdk8-jre-base -RUN +LAYER shared/alpine +LAYER shared/java + +SCRIPT + apk --no-cache add openjdk8-jre-base +RUN diff --git a/basic-runtimes/libxml.lxcfile b/basic-runtimes/libxml.lxcfile index c27acef..3fe2155 100644 --- a/basic-runtimes/libxml.lxcfile +++ b/basic-runtimes/libxml.lxcfile @@ -1,6 +1,6 @@ -LAYER shared/alpine -LAYER shared/libxml - -SCRIPT - apk --no-cache add libxml2 libxslt -RUN +LAYER shared/alpine +LAYER shared/libxml + +SCRIPT + apk --no-cache add libxml2 libxslt +RUN diff --git a/basic-runtimes/php.lxcfile b/basic-runtimes/php.lxcfile index 706da48..b663d4f 100644 --- a/basic-runtimes/php.lxcfile +++ b/basic-runtimes/php.lxcfile @@ -1,6 +1,6 @@ -LAYER shared/alpine -LAYER shared/php - -SCRIPT - apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session -RUN +LAYER shared/alpine +LAYER shared/php + +SCRIPT + apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session +RUN diff --git a/basic-runtimes/python2.lxcfile b/basic-runtimes/python2.lxcfile index e948891..d226748 100644 --- a/basic-runtimes/python2.lxcfile +++ b/basic-runtimes/python2.lxcfile @@ -1,7 +1,7 @@ -LAYER shared/alpine -LAYER shared/libxml -LAYER shared/python2 - -SCRIPT - apk --no-cache add python2 -RUN +LAYER shared/alpine +LAYER shared/libxml +LAYER shared/python2 + +SCRIPT + apk --no-cache add python2 +RUN diff --git a/basic-runtimes/python3.lxcfile b/basic-runtimes/python3.lxcfile index 994ca3f..b7c4094 100644 --- a/basic-runtimes/python3.lxcfile +++ b/basic-runtimes/python3.lxcfile @@ -1,8 +1,8 @@ -LAYER shared/alpine -LAYER shared/libxml -LAYER shared/python2 - -SCRIPT - apk --no-cache add python3 - ln -s /usr/bin/python3 /usr/bin/python -RUN +LAYER shared/alpine +LAYER shared/libxml +LAYER shared/python2 + +SCRIPT + apk --no-cache add python3 + ln -s /usr/bin/python3 /usr/bin/python +RUN diff --git a/build-all.sh b/build-all.sh index dc28a57..ad26911 100755 --- a/build-all.sh +++ b/build-all.sh @@ -3,6 +3,9 @@ set -e SOURCE_DIR=$(realpath $(dirname "${0}")) +# Copy lxc-build +cp ${SOURCE_DIR}/lxc-build /usr/bin/lxc-build + # Build basic Alpine LXC image mkdir -p /var/lib/lxc/shared/alpine wget https://github.com/gliderlabs/docker-alpine/raw/2bfe6510ee31d86cfeb2f37587f4cf866f28ffbc/versions/library-3.8/x86_64/rootfs.tar.xz -O - | tar xJf - -C /var/lib/lxc/shared/alpine