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-postgres/init.sh ./init.sh
ENV dockerdev 1
ENV DEVDB postgres
EXPOSE 3000
CMD ["tail", "-f", "/dev/null"]

View File

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

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: postgres:9-alpine
environment:
POSTGRES_DB: wiki
POSTGRES_PASSWORD: wikijsrocks
POSTGRES_USER: wikijs
logging:
driver: "none"
volumes:
- db-data:/var/lib/postgresql/data
networks:
- wikinet
ports:
- "15432:5432"
adminer:
image: adminer:latest
logging:
driver: "none"
networks:
- wikinet
ports:
- "3001:8080"
wiki:
build:
context: .
dockerfile: dev/docker-postgres/Dockerfile
depends_on:
- db
- redis
networks:
- wikinet
ports:
- "3000:3000"
volumes:
- .:/wiki
- /wiki/node_modules
command: ["sh", "./dev/docker-postgres/init.sh"]
networks:
wikinet:
volumes:
db-data:

View File

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