Compare commits
3 Commits
f0c3cacb06
...
a2180a302c
| Author | SHA1 | Date | |
|---|---|---|---|
| a2180a302c | |||
| cd29115233 | |||
| e4b07ca896 |
@@ -251,7 +251,7 @@ Produktions-Update auf den Server (konfigurierbar via Umgebungsvariablen). Führ
|
|||||||
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/update-prod.sh -dest prod
|
./scripts/update-remotes.sh -dest prod
|
||||||
```
|
```
|
||||||
|
|
||||||
Standard-Ziel Prod: `root@10.0.0.25:/opt/kapteins-daagbok` — per `REMOTE_HOST`, `REMOTE_USER`, `REMOTE_DIR` überschreibbar.
|
Standard-Ziel Prod: `root@10.0.0.25:/opt/kapteins-daagbok` — per `REMOTE_HOST`, `REMOTE_USER`, `REMOTE_DIR` überschreibbar.
|
||||||
@@ -265,7 +265,7 @@ Hinter **Nginx Proxy Manager**: [docs/deployment/npm-security.md](docs/deploymen
|
|||||||
Testumgebung unter [staging.kapteins-daagbok.eu](https://staging.kapteins-daagbok.eu) — Deploy ohne Release-Tag:
|
Testumgebung unter [staging.kapteins-daagbok.eu](https://staging.kapteins-daagbok.eu) — Deploy ohne Release-Tag:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/update-prod.sh -dest stage
|
./scripts/update-remotes.sh -dest stage
|
||||||
```
|
```
|
||||||
|
|
||||||
Standard-Ziel Staging: `root@10.0.0.27:/opt/kapteins-daagbok-staging` — per `REMOTE_HOST`, `REMOTE_DIR`, `DEPLOY_BRANCH` überschreibbar. Details: [docs/deployment/staging.md](docs/deployment/staging.md).
|
Standard-Ziel Staging: `root@10.0.0.27:/opt/kapteins-daagbok-staging` — per `REMOTE_HOST`, `REMOTE_DIR`, `DEPLOY_BRANCH` überschreibbar. Details: [docs/deployment/staging.md](docs/deployment/staging.md).
|
||||||
|
|||||||
+6
-3
@@ -6034,13 +6034,15 @@ html.theme-cupertino .events-scroll-container {
|
|||||||
.app-tour-root {
|
.app-tour-root {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
z-index: 10000;
|
/* Above .app-tour-target-active (10001) so tooltip/backdrop stay topmost */
|
||||||
|
z-index: 10010;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.app-tour-backdrop {
|
.app-tour-backdrop {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
|
z-index: 1;
|
||||||
background: rgba(2, 6, 23, 0.62);
|
background: rgba(2, 6, 23, 0.62);
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
@@ -6058,7 +6060,7 @@ html.theme-cupertino .events-scroll-container {
|
|||||||
0 0 32px rgba(56, 189, 248, 0.5),
|
0 0 32px rgba(56, 189, 248, 0.5),
|
||||||
0 12px 40px rgba(0, 0, 0, 0.35);
|
0 12px 40px rgba(0, 0, 0, 0.35);
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
z-index: 10001;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
body.app-tour-active .app-tour-target-active {
|
body.app-tour-active .app-tour-target-active {
|
||||||
@@ -6069,7 +6071,8 @@ body.app-tour-active .app-tour-target-active {
|
|||||||
|
|
||||||
.app-tour-tooltip {
|
.app-tour-tooltip {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 10002;
|
/* Layer above backdrop/spotlight inside .app-tour-root (not vs. root's 10010) */
|
||||||
|
z-index: 3;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
width: min(420px, calc(100vw - 32px));
|
width: min(420px, calc(100vw - 32px));
|
||||||
max-width: calc(100vw - 32px);
|
max-width: calc(100vw - 32px);
|
||||||
|
|||||||
@@ -31,12 +31,12 @@ cd server && npm test
|
|||||||
|
|
||||||
## Nach erfolgreichem Check
|
## Nach erfolgreichem Check
|
||||||
|
|
||||||
[`scripts/update-prod.sh`](../../scripts/update-prod.sh) führt `predeploy-check.sh` **automatisch** aus (nach Release-Vorbereitung, vor dem SSH-Deploy).
|
[`scripts/update-remotes.sh`](../../scripts/update-remotes.sh) führt `predeploy-check.sh` **automatisch** aus (nach Release-Vorbereitung bei Prod, vor dem SSH-Deploy).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/update-prod.sh -dest prod
|
./scripts/update-remotes.sh -dest prod
|
||||||
```
|
```
|
||||||
|
|
||||||
Notfall ohne Checks (nur wenn nötig): `SKIP_PREDEPLOY_CHECK=1 ./scripts/update-prod.sh -dest prod`
|
Notfall ohne Checks (nur wenn nötig): `SKIP_PREDEPLOY_CHECK=1 ./scripts/update-remotes.sh -dest prod`
|
||||||
|
|
||||||
Manuell auf dem Server: `git pull`, `docker compose build`, `docker compose up -d` (siehe [npm-security.md](npm-security.md)).
|
Manuell auf dem Server: `git pull`, `docker compose build`, `docker compose up -d` (siehe [npm-security.md](npm-security.md)).
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Staging läuft auf **VM3** (`10.0.0.27`) unter **https://staging.kapteins-daagbo
|
|||||||
| Host | `10.0.0.27` | `10.0.0.25` |
|
| Host | `10.0.0.27` | `10.0.0.25` |
|
||||||
| Verzeichnis | `/opt/kapteins-daagbok-staging` | `/opt/kapteins-daagbok` |
|
| Verzeichnis | `/opt/kapteins-daagbok-staging` | `/opt/kapteins-daagbok` |
|
||||||
| Compose | `docker-compose.staging.yml` | `docker-compose.yml` |
|
| Compose | `docker-compose.staging.yml` | `docker-compose.yml` |
|
||||||
| Deploy-Skript | `./scripts/update-prod.sh -dest stage` | `./scripts/update-prod.sh -dest prod` |
|
| Deploy-Skript | `./scripts/update-remotes.sh -dest stage` | `./scripts/update-remotes.sh -dest prod` |
|
||||||
| Release-Tag | nein | ja (`v*`) |
|
| Release-Tag | nein | ja (`v*`) |
|
||||||
| Datenbank-Volume | `daagbox-staging-pgdata` | `daagbox-prod-pgdata` |
|
| Datenbank-Volume | `daagbox-staging-pgdata` | `daagbox-prod-pgdata` |
|
||||||
|
|
||||||
@@ -60,7 +60,7 @@ Optional: `VAPID_*`, `OpenWeatherMapAPIKey`, `OpenRouterAPIKey`, `ADMIN_USER_IDS
|
|||||||
Führt `npm run check` aus, dann SSH-Deploy ohne Release-Tag:
|
Führt `npm run check` aus, dann SSH-Deploy ohne Release-Tag:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/update-prod.sh -dest stage
|
./scripts/update-remotes.sh -dest stage
|
||||||
```
|
```
|
||||||
|
|
||||||
Konfiguration via Umgebungsvariablen:
|
Konfiguration via Umgebungsvariablen:
|
||||||
@@ -69,10 +69,10 @@ Konfiguration via Umgebungsvariablen:
|
|||||||
REMOTE_HOST=10.0.0.27 \
|
REMOTE_HOST=10.0.0.27 \
|
||||||
REMOTE_DIR=/opt/kapteins-daagbok-staging \
|
REMOTE_DIR=/opt/kapteins-daagbok-staging \
|
||||||
DEPLOY_BRANCH=master \
|
DEPLOY_BRANCH=master \
|
||||||
./scripts/update-prod.sh -dest stage
|
./scripts/update-remotes.sh -dest stage
|
||||||
```
|
```
|
||||||
|
|
||||||
Notfall ohne Checks: `SKIP_PREDEPLOY_CHECK=1 ./scripts/update-prod.sh -dest stage`
|
Notfall ohne Checks: `SKIP_PREDEPLOY_CHECK=1 ./scripts/update-remotes.sh -dest stage`
|
||||||
|
|
||||||
## NPM (VM1)
|
## NPM (VM1)
|
||||||
|
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ require_node_toolchain() {
|
|||||||
echo ""
|
echo ""
|
||||||
echo "On the production host, prefer updating the running stack:"
|
echo "On the production host, prefer updating the running stack:"
|
||||||
echo " docker compose -f docker-compose.yml up -d --build"
|
echo " docker compose -f docker-compose.yml up -d --build"
|
||||||
echo " # or from your workstation: ./scripts/update-prod.sh"
|
echo " # or from your workstation: ./scripts/update-remotes.sh -dest prod"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Backward-compatible wrapper — prefer: ./scripts/update-prod.sh -dest stage
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
for arg in "$@"; do
|
|
||||||
case "$arg" in
|
|
||||||
-dest|-dest=*)
|
|
||||||
echo "Error: update-staging.sh always deploys to staging." >&2
|
|
||||||
echo " Use ./scripts/update-prod.sh -dest prod for production." >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
exec "$SCRIPT_DIR/update-prod.sh" -dest stage "$@"
|
|
||||||
Reference in New Issue
Block a user