Skip to content

Commit 77cfc8e

Browse files
authored
Merge pull request #75 from LibreCodeCoop/fix/start-mysql
Fix/start mysql
2 parents 46a996f + ea90922 commit 77cfc8e

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.docker/scripts/entrypoint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ groupmod --non-unique --gid "${HOST_GID}" www-data
66

77
# Clone Nextcloud repository, if needed
88
if [ ! -d ".git" ]; then
9-
git clone --progress --single-branch --depth 1 --branch "${VERSION_NEXTCLOUD}" --recurse-submodules -j 4 https://github.com/nextcloud/server /var/www/html
9+
git init
10+
git remote add origin https://github.com/nextcloud/server
11+
git fetch --depth=1 origin "${VERSION_NEXTCLOUD}"
12+
git checkout "${VERSION_NEXTCLOUD}"
13+
git submodule update --init --recursive
1014
mkdir data
1115
mkdir apps-writable
1216
mkdir apps-extra

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ services:
1313
command: postgres -c log_statement=all
1414
mysql:
1515
image: mysql
16-
cap_add:
17-
- SYS_NICE # CAP_SYS_NICE
1816
volumes:
19-
- ./.docker/config/mysql:/etc/mysql/conf.d
20-
- ./volumes/mysql/dump:/docker-entrypoint-initdb.d
21-
- ./volumes/mysql/data:/var/lib/mysql
17+
- mysql-init:/docker-entrypoint-initdb.d
18+
- mysql-data:/var/lib/mysql
2219
ports:
2320
- 127.0.0.1:3306:3306
2421
restart: unless-stopped
@@ -78,3 +75,6 @@ services:
7875
- 127.0.0.1:${MAILHOG_PORT:-8025}:8025
7976
redis:
8077
image: redis
78+
volumes:
79+
mysql-init:
80+
mysql-data:

nextcloud

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit d237fd0e78af8bbff51f2802efd4db1d88457579

0 commit comments

Comments
 (0)