liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: JSON fields handling for MariaDB

Browse Source
This commit is contained in:
Nick
2019-02-09 19:10:34 -05:00
parent a8c7710412
commit b1dd54768f
35 changed files with 447 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/build/Dockerfile
View File

@@ -29,7 +29,7 @@ FROM node:10.15-alpine
LABEL maintainer="requarks.io"
RUN apk update && \
apk add bash curl git openssh gnupg supervisor --no-cache && \
apk add bash curl git openssh gnupg sqlite --no-cache && \
rm -rf /var/cache/apk/* && \
mkdir -p /wiki && \
mkdir -p /logs

0
dev/docker/wait.sh → dev/docker-common/wait.sh
View File

21
dev/docker-mariadb/Dockerfile Normal file
View File

@@ -0,0 +1,21 @@
# -- DEV DOCKERFILE --
# -- DO NOT USE IN PRODUCTION! --
FROM node:10-alpine
LABEL maintainer "requarks.io"
RUN apk update && \
apk add bash curl git python make g++ nano openssh gnupg --no-cache && \
mkdir -p /wiki
WORKDIR /wiki
COPY package.json .
RUN yarn --silent
COPY ./dev/docker-mariadb/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB mariadb
EXPOSE 3000
CMD ["tail", "-f", "/dev/null"]

14
dev/docker-mariadb/config.yml Normal file
View File

@@ -0,0 +1,14 @@
port: 3000
bindIP: 0.0.0.0
db:
type: mariadb
host: db
port: 3306
user: wikijs
pass: wikijsrocks
db: wiki
redis:
host: redis
port: 6379
db: 0
logLevel: info

61
dev/docker-mariadb/docker-compose.yml Normal file
View File

@@ -0,0 +1,61 @@
# -- DEV DOCKER-COMPOSE --
# -- DO NOT USE IN PRODUCTION! --
version: "3"
services:
redis:
image: redis:4-alpine
ports:
- "16379:6379"
logging:
driver: "none"
networks:
- wikinet
db:
image: mariadb:10.3
environment:
MYSQL_DATABASE: wiki
MYSQL_PASSWORD: wikijsrocks
MYSQL_USER: wikijs
MYSQL_ROOT_PASSWORD: wikijsrocks
logging:
driver: "none"
volumes:
- db-data:/var/lib/mysql
networks:
- wikinet
ports:
- "13306:3306"
adminer:
image: adminer:latest
logging:
driver: "none"
networks:
- wikinet
ports:
- "3001:8080"
wiki:
build:
context: .
dockerfile: dev/docker-mariadb/Dockerfile
depends_on:
- db
- redis
networks:
- wikinet
ports:
- "3000:3000"
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker-mariadb/init.sh"]
networks:
wikinet:
volumes:
db-data:

7
dev/docker-mariadb/init.sh Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
echo "Waiting for redis and mariadb to start up..."
bash ./dev/docker-common/wait.sh redis:6379
bash ./dev/docker-common/wait.sh db:3306
echo "=== READY ==="
tail -f /dev/null

3
dev/docker/Dockerfile → dev/docker-mssql/Dockerfile
View File

@@ -11,9 +11,10 @@ RUN apk update && \
WORKDIR /wiki
COPY package.json .
RUN yarn --silent
COPY ./dev/docker/init.sh ./init.sh
COPY ./dev/docker-mssql/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB mssql
EXPOSE 3000

14
dev/docker-mssql/config.yml Normal file
View File

@@ -0,0 +1,14 @@
port: 3000
bindIP: 0.0.0.0
db:
type: mssql
host: db
port: 1433
user: SA
pass: W1kiJSR0cks!
db: wiki
redis:
host: redis
port: 6379
db: 0
logLevel: info

60
dev/docker-mssql/docker-compose.yml Normal file
View File

@@ -0,0 +1,60 @@
# -- DEV DOCKER-COMPOSE --
# -- DO NOT USE IN PRODUCTION! --
version: "3"
services:
redis:
image: redis:4-alpine
ports:
- "16379:6379"
logging:
driver: "none"
networks:
- wikinet
db:
image: mcr.microsoft.com/mssql/server:2017-latest
environment:
ACCEPT_EULA: 'Y'
MSSQL_PID: Developer
SA_PASSWORD: W1kiJSR0cks!
logging:
driver: "none"
volumes:
- db-data:/var/opt/mssql
networks:
- wikinet
ports:
- "11433:1433"
adminer:
image: adminer:latest
logging:
driver: "none"
networks:
- wikinet
ports:
- "3001:8080"
wiki:
build:
context: .
dockerfile: dev/docker-mssql/Dockerfile
depends_on:
- db
- redis
networks:
- wikinet
ports:
- "3000:3000"
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker-mssql/init.sh"]
networks:
wikinet:
volumes:
db-data:

7
dev/docker-mssql/init.sh Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
echo "Waiting for redis and mssql to start up..."
bash ./dev/docker-common/wait.sh redis:6379
bash ./dev/docker-common/wait.sh db:1433
echo "=== READY ==="
tail -f /dev/null

21
dev/docker-mysql/Dockerfile Normal file
View File

@@ -0,0 +1,21 @@
# -- DEV DOCKERFILE --
# -- DO NOT USE IN PRODUCTION! --
FROM node:10-alpine
LABEL maintainer "requarks.io"
RUN apk update && \
apk add bash curl git python make g++ nano openssh gnupg --no-cache && \
mkdir -p /wiki
WORKDIR /wiki
COPY package.json .
RUN yarn --silent
COPY ./dev/docker-mysql/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB mysql
EXPOSE 3000
CMD ["tail", "-f", "/dev/null"]

14
dev/docker-mysql/config.yml Normal file
View File

@@ -0,0 +1,14 @@
port: 3000
bindIP: 0.0.0.0
db:
type: mysql
host: db
port: 3306
user: wikijs
pass: wikijsrocks
db: wiki
redis:
host: redis
port: 6379
db: 0
logLevel: info

61
dev/docker-mysql/docker-compose.yml Normal file
View File

@@ -0,0 +1,61 @@
# -- DEV DOCKER-COMPOSE --
# -- DO NOT USE IN PRODUCTION! --
version: "3"
services:
redis:
image: redis:4-alpine
ports:
- "16379:6379"
logging:
driver: "none"
networks:
- wikinet
db:
image: mysql:5.7
environment:
MYSQL_DATABASE: wiki
MYSQL_PASSWORD: wikijsrocks
MYSQL_USER: wikijs
MYSQL_ROOT_PASSWORD: wikijsrocks
logging:
driver: "none"
volumes:
- db-data:/var/lib/mysql
networks:
- wikinet
ports:
- "13306:3306"
adminer:
image: adminer:latest
logging:
driver: "none"
networks:
- wikinet
ports:
- "3001:8080"
wiki:
build:
context: .
dockerfile: dev/docker-mysql/Dockerfile
depends_on:
- db
- redis
networks:
- wikinet
ports:
- "3000:3000"
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker-mysql/init.sh"]
networks:
wikinet:
volumes:
db-data:

7
dev/docker-mysql/init.sh Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
echo "Waiting for redis and mysql to start up..."
bash ./dev/docker-common/wait.sh redis:6379
bash ./dev/docker-common/wait.sh db:3306
echo "=== READY ==="
tail -f /dev/null

21
dev/docker-postgres/Dockerfile Normal file
View File

@@ -0,0 +1,21 @@
# -- DEV DOCKERFILE --
# -- DO NOT USE IN PRODUCTION! --
FROM node:10-alpine
LABEL maintainer "requarks.io"
RUN apk update && \
apk add bash curl git python make g++ nano openssh gnupg --no-cache && \
mkdir -p /wiki
WORKDIR /wiki
COPY package.json .
RUN yarn --silent
COPY ./dev/docker-postgres/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB postgres
EXPOSE 3000
CMD ["tail", "-f", "/dev/null"]

0
dev/docker/config.yml → dev/docker-postgres/config.yml
View File

4
dev/docker/docker-compose.yml → dev/docker-postgres/docker-compose.yml
View File

@@ -40,7 +40,7 @@ services:
wiki:
build:
context: .
dockerfile: dev/docker/Dockerfile
dockerfile: dev/docker-postgres/Dockerfile
depends_on:
- db
- redis
@@ -51,7 +51,7 @@ services:
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker/init.sh"]
command: ["sh", "./dev/docker-postgres/init.sh"]
networks:
wikinet:

4
dev/docker/init.sh → dev/docker-postgres/init.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
echo "Waiting for redis and postgres to start up..."
bash ./dev/docker/wait.sh redis:6379
bash ./dev/docker/wait.sh db:5432
bash ./dev/docker-common/wait.sh redis:6379
bash ./dev/docker-common/wait.sh db:5432
echo "=== READY ==="
tail -f /dev/null

21
dev/docker-sqlite/Dockerfile Normal file
View File

@@ -0,0 +1,21 @@
# -- DEV DOCKERFILE --
# -- DO NOT USE IN PRODUCTION! --
FROM node:10-alpine
LABEL maintainer "requarks.io"
RUN apk update && \
apk add bash curl git python make g++ nano openssh gnupg sqlite --no-cache && \
mkdir -p /wiki
WORKDIR /wiki
COPY package.json .
RUN yarn --silent
COPY ./dev/docker-sqlite/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB sqlite
EXPOSE 3000
CMD ["tail", "-f", "/dev/null"]

10
dev/docker-sqlite/config.yml Normal file
View File

@@ -0,0 +1,10 @@
port: 3000
bindIP: 0.0.0.0
db:
type: sqlite
storage: /wiki/db.sqlite
redis:
host: redis
port: 6379
db: 0
logLevel: info

35
dev/docker-sqlite/docker-compose.yml Normal file
View File

@@ -0,0 +1,35 @@
# -- DEV DOCKER-COMPOSE --
# -- DO NOT USE IN PRODUCTION! --
version: "3"
services:
redis:
image: redis:4-alpine
ports:
- "16379:6379"
logging:
driver: "none"
networks:
- wikinet
wiki:
build:
context: .
dockerfile: dev/docker-sqlite/Dockerfile
depends_on:
- redis
networks:
- wikinet
ports:
- "3000:3000"
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker-sqlite/init.sh"]
networks:
wikinet:
volumes:
db-data:

6
dev/docker-sqlite/init.sh Normal file
View File

@@ -0,0 +1,6 @@
#!/bin/sh
echo "Waiting for redis to start up..."
bash ./dev/docker-common/wait.sh redis:6379
echo "=== READY ==="
tail -f /dev/null