Merge branch 'feat-setup-ipv6' of github.com:usrpro/Mailu into feat-setup-ipv6
commit
bdb0821e6e
@ -0,0 +1,30 @@
|
||||
"""change quota type to bigint
|
||||
|
||||
Revision ID: 3b7eee912b41
|
||||
Revises: fc099bd15cbe
|
||||
Create Date: 2019-01-15 08:51:05.346257
|
||||
|
||||
"""
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '3b7eee912b41'
|
||||
down_revision = 'fc099bd15cbe'
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
def upgrade():
|
||||
with op.batch_alter_table('domain') as batch:
|
||||
batch.alter_column('max_quota_bytes', type_=sa.BigInteger(), nullable=False, server_default='0')
|
||||
|
||||
with op.batch_alter_table('user') as batch:
|
||||
batch.alter_column('quota_bytes', type_=sa.BigInteger(), nullable=False)
|
||||
batch.alter_column('quota_bytes_used', type_=sa.BigInteger(), nullable=False, server_default='0')
|
||||
|
||||
def downgrade():
|
||||
with op.batch_alter_table('domain') as batch:
|
||||
batch.alter_column('max_quota_bytes', type_=sa.Integer(), nullable=False, server_default='0')
|
||||
|
||||
with op.batch_alter_table('user') as batch:
|
||||
batch.alter_column('quota_bytes', type_=sa.Integer(), nullable=False)
|
||||
batch.alter_column('quota_bytes_used', type_=sa.Integer(), nullable=False, server_default='0')
|
@ -1,28 +1,10 @@
|
||||
# This file is used to test the mailu/docs website
|
||||
# Deployment files can be found on github.com/mailu/infra
|
||||
|
||||
version: '3'
|
||||
|
||||
|
||||
services:
|
||||
docs_master:
|
||||
image: mailu/docs:master
|
||||
networks:
|
||||
- web
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.port=80
|
||||
- traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/master/
|
||||
|
||||
docs_15:
|
||||
image: mailu/docs:1.5
|
||||
networks:
|
||||
- web
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.port=80
|
||||
- traefik.root.frontend.redirect.regex=.*
|
||||
- traefik.root.frontend.redirect.replacement=/1.5/
|
||||
- traefik.root.frontend.rule=Host:${ADDRESS};PathPrefix:/
|
||||
- traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/1.5/
|
||||
|
||||
networks:
|
||||
web:
|
||||
external: true
|
||||
docs:
|
||||
image: ${DOCKER_ORG:-mailu}/docs:${MAILU_VERSION:-master}
|
||||
ports:
|
||||
- 127.0.0.1:8000:80
|
||||
|
@ -1,50 +1,16 @@
|
||||
# This file is used to run the mailu/setup utility
|
||||
# This file is used to test the mailu/setup utility
|
||||
# Deployment files can be found on github.com/mailu/infra
|
||||
|
||||
version: '3.6'
|
||||
|
||||
services:
|
||||
redis:
|
||||
image: redis:alpine
|
||||
networks:
|
||||
- default
|
||||
|
||||
setup_master:
|
||||
image: mailu/setup:master
|
||||
networks:
|
||||
- web
|
||||
- default
|
||||
setup:
|
||||
image: ${DOCKER_ORG:-mailu}/setup:${MAILU_VERSION:-master}
|
||||
env_file: .env
|
||||
environment:
|
||||
this_version: "master"
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.port=80
|
||||
- traefik.docker.network=web
|
||||
- traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/master/
|
||||
depends_on:
|
||||
- redis
|
||||
|
||||
setup_release:
|
||||
image: mailu/setup:${RELEASE}
|
||||
networks:
|
||||
- web
|
||||
- default
|
||||
env_file: .env
|
||||
environment:
|
||||
this_version: ${RELEASE}
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.port=80
|
||||
- traefik.docker.network=web
|
||||
- traefik.root.frontend.redirect.regex=.*
|
||||
- traefik.root.frontend.redirect.replacement=/${RELEASE}/
|
||||
- traefik.root.frontend.rule=Host:${ADDRESS};PathPrefix:/
|
||||
- traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/${RELEASE}/
|
||||
depends_on:
|
||||
- redis
|
||||
|
||||
networks:
|
||||
web:
|
||||
external: true
|
||||
default:
|
||||
external: false
|
||||
ports:
|
||||
- 127.0.0.1:8001:80
|
||||
|
Loading…
Reference in New Issue