xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

update to version 18

Browse Source 
parameterized nextcloud version in build files
This commit is contained in:
richard
2021-03-07 16:23:58 -05:00
parent 6a8d2e5e79
commit bc7a409235
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dockerfiles/services/nextcloud/Dockerfile-mono
View File

@@ -1,4 +1,5 @@
FROM nextcloud:17-apache ARG NC_VERSION=17
FROM nextcloud:${NC_VERSION}-apache
RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*

7
dockerfiles/services/nextcloud/cli/build
View File

@@ -2,8 +2,9 @@
set -e set -e
#set -x #set -x
NC_VERSION=18
LOCAL_IMAGE=xaicorp/nextcloud LOCAL_IMAGE=xaicorp/nextcloud
TAG=17.0-${BUILD_NUMBER:-dev} TAG=${NC_VERSION}.0-${BUILD_NUMBER:-dev}
REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG} REMOTE_IMAGE=dkregistry.xai-corp.net:5000/${LOCAL_IMAGE}:${TAG}
LOG=$(mktemp) LOG=$(mktemp)
@@ -13,6 +14,7 @@ export REMOTE_IMAGE
export TAG export TAG
dc() { dc() {
export NC_VERSION=${NC_VERSION}
# shellcheck disable=SC2068 # shellcheck disable=SC2068
docker-compose \ docker-compose \
-f docker-compose.yml \ -f docker-compose.yml \
@@ -29,8 +31,7 @@ build() {
build_test() { build_test() {
echo -e "\e[33m testing the image\e[39m" echo -e "\e[33m testing the image\e[39m"
#todo test that occ is present dc run --rm app php /usr/src/nextcloud/occ --version | grep ${NC_VERSION}
dc run --rm app php /usr/src/nextcloud/occ --version
#test for smbclient installed #test for smbclient installed

2
dockerfiles/services/nextcloud/docker-compose.build.yml
View File

@@ -12,6 +12,8 @@ services:
build: build:
context: . context: .
dockerfile: ./Dockerfile-mono dockerfile: ./Dockerfile-mono
args:
NC_VERSION: ${NC_VERSION:-17}
volumes: volumes:
- ./config:/var/www/html/config - ./config:/var/www/html/config