Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2019-07-02 04:15:46 +0300
committernachoparker <nacho@ownyourbits.com>2019-07-06 06:43:54 +0300
commit35526ab9fcfc538b68a10bbf449d6b1fe5ea7d6d (patch)
treebf5f7762937f0fd38bb7463041e25726cc74bd16 /docker/lamp
parent88da901eddff125b3e71d9706fbe02edffc659b3 (diff)
build: use a system wide config file. Remove sury sources
Signed-off-by: nachoparker <nacho@ownyourbits.com>
Diffstat (limited to 'docker/lamp')
-rwxr-xr-xdocker/lamp/010lamp4
-rw-r--r--docker/lamp/Dockerfile5
2 files changed, 5 insertions, 4 deletions
diff --git a/docker/lamp/010lamp b/docker/lamp/010lamp
index 5bb2dbaa..fb8f8320 100755
--- a/docker/lamp/010lamp
+++ b/docker/lamp/010lamp
@@ -1,8 +1,6 @@
#!/bin/bash
-source /usr/local/etc/library.sh
-
-PHPVER=7.2
+source /usr/local/etc/library.sh # sets PHPVER
set -e
diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile
index c0b9276f..393a4736 100644
--- a/docker/lamp/Dockerfile
+++ b/docker/lamp/Dockerfile
@@ -10,11 +10,14 @@ SHELL ["/bin/bash", "-c"]
ENV DOCKERBUILD 1
-COPY etc/library.sh lamp.sh /usr/local/etc/
+COPY etc/ncp.cfg etc/library.sh lamp.sh /usr/local/etc/
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
# installation
+apt-get update; \
+apt-get install --no-install-recommends -y jq; \
+
source /usr/local/etc/library.sh; \
set +x; \
install_app /usr/local/etc/lamp.sh; \