mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-12-06 08:16:51 +00:00
Compare commits
4 Commits
c303b69649
...
2893ffb1e4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2893ffb1e4 | ||
|
|
1a117a267c | ||
|
|
b8e3e594fb | ||
|
|
71251d2a0d |
@@ -1,17 +1,16 @@
|
|||||||
# WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production.
|
# WARNING: This is a CI docker-compose file used for building and testing of the entire app, it should not be used for production.
|
||||||
services:
|
services:
|
||||||
|
|
||||||
cypress:
|
cypress:
|
||||||
environment:
|
environment:
|
||||||
CYPRESS_stack: 'postgres'
|
CYPRESS_stack: "postgres"
|
||||||
|
|
||||||
fullstack:
|
fullstack:
|
||||||
environment:
|
environment:
|
||||||
DB_POSTGRES_HOST: 'db-postgres'
|
DB_POSTGRES_HOST: "db-postgres"
|
||||||
DB_POSTGRES_PORT: '5432'
|
DB_POSTGRES_PORT: "5432"
|
||||||
DB_POSTGRES_USER: 'npm'
|
DB_POSTGRES_USER: "npm"
|
||||||
DB_POSTGRES_PASSWORD: 'npmpass'
|
DB_POSTGRES_PASSWORD: "npmpass"
|
||||||
DB_POSTGRES_NAME: 'npm'
|
DB_POSTGRES_NAME: "npm"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db-postgres
|
- db-postgres
|
||||||
- authentik
|
- authentik
|
||||||
@@ -19,11 +18,11 @@ services:
|
|||||||
- authentik-ldap
|
- authentik-ldap
|
||||||
|
|
||||||
db-postgres:
|
db-postgres:
|
||||||
image: postgres:latest
|
image: postgres:17
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: 'npm'
|
POSTGRES_USER: "npm"
|
||||||
POSTGRES_PASSWORD: 'npmpass'
|
POSTGRES_PASSWORD: "npmpass"
|
||||||
POSTGRES_DB: 'npm'
|
POSTGRES_DB: "npm"
|
||||||
volumes:
|
volumes:
|
||||||
- psql_vol:/var/lib/postgresql/data
|
- psql_vol:/var/lib/postgresql/data
|
||||||
- ./ci/postgres:/docker-entrypoint-initdb.d
|
- ./ci/postgres:/docker-entrypoint-initdb.d
|
||||||
@@ -31,11 +30,11 @@ services:
|
|||||||
- fulltest
|
- fulltest
|
||||||
|
|
||||||
authentik-redis:
|
authentik-redis:
|
||||||
image: 'redis:alpine'
|
image: "redis:alpine"
|
||||||
command: --save 60 1 --loglevel warning
|
command: --save 60 1 --loglevel warning
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ['CMD-SHELL', 'redis-cli ping | grep PONG']
|
test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
|
||||||
start_period: 20s
|
start_period: 20s
|
||||||
interval: 30s
|
interval: 30s
|
||||||
retries: 5
|
retries: 5
|
||||||
@@ -66,9 +65,9 @@ services:
|
|||||||
authentik-ldap:
|
authentik-ldap:
|
||||||
image: ghcr.io/goauthentik/ldap:2024.10.1
|
image: ghcr.io/goauthentik/ldap:2024.10.1
|
||||||
environment:
|
environment:
|
||||||
AUTHENTIK_HOST: 'http://authentik:9000'
|
AUTHENTIK_HOST: "http://authentik:9000"
|
||||||
AUTHENTIK_INSECURE: 'true'
|
AUTHENTIK_INSECURE: "true"
|
||||||
AUTHENTIK_TOKEN: 'wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp'
|
AUTHENTIK_TOKEN: "wKYZuRcI0ETtb8vWzMCr04oNbhrQUUICy89hSpDln1OEKLjiNEuQ51044Vkp"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- authentik
|
- authentik
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ services:
|
|||||||
- "/etc/localtime:/etc/localtime:ro"
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
|
||||||
db-postgres:
|
db-postgres:
|
||||||
image: postgres:latest
|
image: postgres:17
|
||||||
container_name: npm2dev.db-postgres
|
container_name: npm2dev.db-postgres
|
||||||
networks:
|
networks:
|
||||||
- nginx_proxy_manager
|
- nginx_proxy_manager
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ services:
|
|||||||
- db
|
- db
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:latest
|
image: postgres:17
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: 'npm'
|
POSTGRES_USER: 'npm'
|
||||||
POSTGRES_PASSWORD: 'npmpass'
|
POSTGRES_PASSWORD: 'npmpass'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
|
import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
|
||||||
import { LocalePicker, ThemeSwitcher } from "src/components";
|
import { LocalePicker, ThemeSwitcher, NavLink } from "src/components";
|
||||||
import { useAuthState } from "src/context";
|
import { useAuthState } from "src/context";
|
||||||
import { useUser } from "src/hooks";
|
import { useUser } from "src/hooks";
|
||||||
import { T } from "src/locale";
|
import { T } from "src/locale";
|
||||||
@@ -26,7 +26,8 @@ export function SiteHeader() {
|
|||||||
<span className="navbar-toggler-icon" />
|
<span className="navbar-toggler-icon" />
|
||||||
</button>
|
</button>
|
||||||
<div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
|
<div className="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
|
||||||
<span className={styles.logo}>
|
<NavLink to="/">
|
||||||
|
<div className={styles.logo}>
|
||||||
<img
|
<img
|
||||||
src="/images/logo-no-text.svg"
|
src="/images/logo-no-text.svg"
|
||||||
width={40}
|
width={40}
|
||||||
@@ -34,8 +35,9 @@ export function SiteHeader() {
|
|||||||
className="navbar-brand-image"
|
className="navbar-brand-image"
|
||||||
alt="Logo"
|
alt="Logo"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
Nginx Proxy Manager
|
Nginx Proxy Manager
|
||||||
</span>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
<div className="navbar-nav flex-row order-md-last">
|
<div className="navbar-nav flex-row order-md-last">
|
||||||
<div className="d-none d-md-flex">
|
<div className="d-none d-md-flex">
|
||||||
|
|||||||
Reference in New Issue
Block a user