diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/dockerfiles/services/nextcloud/Dockerfile-mono b/dockerfiles/services/nextcloud/Dockerfile-mono index 3e4a8fa..e74f9c4 100755 --- a/dockerfiles/services/nextcloud/Dockerfile-mono +++ b/dockerfiles/services/nextcloud/Dockerfile-mono @@ -1,4 +1,4 @@ -FROM nextcloud:15-apache +FROM nextcloud:16-apache RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/services/nextcloud/build.sh b/dockerfiles/services/nextcloud/build.sh index f5cfba0..f800fbc 100644 --- a/dockerfiles/services/nextcloud/build.sh +++ b/dockerfiles/services/nextcloud/build.sh @@ -4,4 +4,4 @@ export DOCKER_HOST=dkmanager:2376 docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY docker-compose -f docker-compose-mono.yml build -docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15 +docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:16 diff --git a/dockerfiles/services/nextcloud/docker-compose-mono.yml b/dockerfiles/services/nextcloud/docker-compose-mono.yml index 0201258..90eeb99 100755 --- a/dockerfiles/services/nextcloud/docker-compose-mono.yml +++ b/dockerfiles/services/nextcloud/docker-compose-mono.yml @@ -12,4 +12,4 @@ services: build: context: . dockerfile: ./Dockerfile-mono - image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15 + image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:16 diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml index d9706bd..ce544a7 100755 --- a/dockerfiles/services/nextcloud/docker-compose-prod.yml +++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml @@ -12,7 +12,7 @@ volumes: services: app: - image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:15" + image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:16" ports: - 8083:80 volumes: diff --git a/dockerfiles/services/services/launch_services.sh b/dockerfiles/services/services/launch_services.sh index b362ecd..39be117 100755 --- a/dockerfiles/services/services/launch_services.sh +++ b/dockerfiles/services/services/launch_services.sh @@ -11,7 +11,7 @@ scale_out() { REPLICA_COUNT=`docker service inspect $1 | jq '.[0].Spec.Mode.Replicated.Replicas'` ./timeout.sh -t $2 docker service scale $1=$(($REPLICA_COUNT*2)) ./timeout.sh -t $2 docker service scale $1=$(($REPLICA_COUNT)) - docker service update -q $1 + ./timeout.sh -t $2 docker service update -q $1 } docker stack deploy -c dkregistry/docker-compose.yml $SERVICE