chore: bump version

fix: merge conflicts
This commit is contained in:
Nicolas Meienberger 2022-10-23 10:16:09 +02:00
parent fda8a4d824
commit 3d8b08f88e
6 changed files with 9 additions and 11 deletions

View file

@ -4,7 +4,7 @@ services:
reverse-proxy:
container_name: reverse-proxy
image: traefik:v2.8
restart: always
restart: unless-stopped
ports:
- ${NGINX_PORT-80}:80
- ${NGINX_PORT_SSL-443}:443
@ -21,7 +21,7 @@ services:
tipi-db:
container_name: tipi-db
image: postgres:14
restart: on-failure
restart: unless-stopped
stop_grace_period: 1m
volumes:
- ./data/postgres:/var/lib/postgresql/data
@ -131,8 +131,6 @@ services:
# Middlewares
traefik.http.middlewares.redirect-middleware.redirectregex.regex: .*
traefik.http.middlewares.redirect-middleware.redirectregex.replacement: /dashboard
networks:
tipi_main_network:

View file

@ -4,7 +4,7 @@ services:
reverse-proxy:
container_name: reverse-proxy
image: traefik:v2.8
restart: always
restart: unless-stopped
ports:
- ${NGINX_PORT-80}:80
- ${NGINX_PORT_SSL-443}:443
@ -20,7 +20,7 @@ services:
tipi-db:
container_name: tipi-db
image: postgres:14
restart: on-failure
restart: unless-stopped
stop_grace_period: 1m
volumes:
- ./data/postgres:/var/lib/postgresql/data

View file

@ -4,7 +4,7 @@ services:
reverse-proxy:
container_name: reverse-proxy
image: traefik:v2.8
restart: always
restart: unless-stopped
ports:
- ${NGINX_PORT-80}:80
- ${NGINX_PORT_SSL-443}:443
@ -19,7 +19,7 @@ services:
tipi-db:
container_name: tipi-db
image: postgres:14
restart: on-failure
restart: unless-stopped
stop_grace_period: 1m
volumes:
- ${PWD}/data/postgres:/var/lib/postgresql/data

View file

@ -1,6 +1,6 @@
{
"name": "runtipi",
"version": "0.7.1",
"version": "0.7.2",
"description": "A homeserver for everyone",
"scripts": {
"prepare": "husky install",

View file

@ -1,6 +1,6 @@
{
"name": "dashboard",
"version": "0.7.1",
"version": "0.7.2",
"private": true,
"scripts": {
"test": "jest --colors",

View file

@ -1,6 +1,6 @@
{
"name": "system-api",
"version": "0.7.1",
"version": "0.7.2",
"description": "",
"exports": "./dist/server.js",
"type": "module",