fix: JSON fields handling for MariaDB

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

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"]

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

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