diff --git a/admin/freeposte/__init__.py b/admin/freeposte/__init__.py index ed901ebd..facf4d0a 100644 --- a/admin/freeposte/__init__.py +++ b/admin/freeposte/__init__.py @@ -44,6 +44,10 @@ manager.add_command('db', flask_migrate.MigrateCommand) # Connect to the Docker socket dockercli = docker.Client(base_url=app.config['DOCKER_SOCKET']) -# Finally setup the blueprint +# Finally setup the blueprint and redirect / from freeposte import admin app.register_blueprint(admin.app, url_prefix='/admin') + +@app.route("/") +def index(): + return flask.redirect(flask.url_for("admin.index")) diff --git a/docker-compose.yml b/docker-compose.yml index d36ac7c7..2e7acb9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,17 +74,19 @@ services: - "$ROOT/filter:/data" admin: - # build: admin + build: admin image: freeposte/admin:$VERSION restart: always env_file: .env + ports: + - "127.0.0.1:8000:80" volumes: - "$ROOT/freeposte:/data" - "$ROOT/dkim:/dkim" - /var/run/docker.sock:/var/run/docker.sock:ro webmail: - build: "$WEBMAIL" + # build: "$WEBMAIL" image: "freeposte/$WEBMAIL:$VERSION" restart: always env_file: .env