fix(deploy): revert to sed+Gitea secrets (int node Consul too old for template stanza)
Some checks failed
Build and Deploy MoneyMaker / build-and-deploy (push) Has been cancelled
Some checks failed
Build and Deploy MoneyMaker / build-and-deploy (push) Has been cancelled
Consul template requires >= 1.8.0 on allocation node; int has older version. Gitea secrets injected via sed at deploy time — no secrets in git.
This commit is contained in:
@@ -80,13 +80,23 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
||||||
|
|
||||||
|
- name: Substitute secrets into Nomad job
|
||||||
|
run: |
|
||||||
|
sed \
|
||||||
|
-e "s|__DATABASE_URL__|${{ secrets.DATABASE_URL }}|g" \
|
||||||
|
-e "s|__ANTHROPIC_API_KEY__|${{ secrets.ANTHROPIC_API_KEY }}|g" \
|
||||||
|
-e "s|__SAXO_APP_KEY__|${{ secrets.SAXO_APP_KEY }}|g" \
|
||||||
|
-e "s|__SAXO_APP_SECRET_1__|${{ secrets.SAXO_APP_SECRET_1 }}|g" \
|
||||||
|
-e "s|__SAXO_BASE__|${{ secrets.SAXO_BASE }}|g" \
|
||||||
|
mmd.nomad > mmd_deploy.nomad
|
||||||
|
|
||||||
- name: Validate Nomad job
|
- name: Validate Nomad job
|
||||||
run: nomad job validate mmd.nomad
|
run: nomad job validate mmd_deploy.nomad
|
||||||
env:
|
env:
|
||||||
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
||||||
|
|
||||||
- name: Deploy to Nomad
|
- name: Deploy to Nomad
|
||||||
run: nomad job run mmd.nomad
|
run: nomad job run mmd_deploy.nomad
|
||||||
env:
|
env:
|
||||||
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
NOMAD_ADDR: "https://nomad.i80.dk:4646"
|
||||||
|
|
||||||
|
|||||||
42
mmd.nomad
42
mmd.nomad
@@ -89,22 +89,11 @@ job "moneymaker" {
|
|||||||
LOG_DIR = "/app/data/logs"
|
LOG_DIR = "/app/data/logs"
|
||||||
SAXO_TOKEN_FILE = "/app/data/.saxo_token.json"
|
SAXO_TOKEN_FILE = "/app/data/.saxo_token.json"
|
||||||
HF_HOME = "/app/data/hf-cache"
|
HF_HOME = "/app/data/hf-cache"
|
||||||
}
|
DATABASE_URL = "__DATABASE_URL__"
|
||||||
|
ANTHROPIC_API_KEY = "__ANTHROPIC_API_KEY__"
|
||||||
template {
|
SAXO_APP_KEY = "__SAXO_APP_KEY__"
|
||||||
data = <<EOF
|
SAXO_APP_SECRET_1 = "__SAXO_APP_SECRET_1__"
|
||||||
DATABASE_URL={{ key "mmd/DATABASE_URL" }}
|
SAXO_BASE = "__SAXO_BASE__"
|
||||||
ANTHROPIC_API_KEY={{ key "mmd/anthropic_api_key" }}
|
|
||||||
SAXO_APP_KEY={{ key "mmd/SAXO_APP_KEY" }}
|
|
||||||
SAXO_APP_SECRET_1={{ key "mmd/SAXO_APP_SECRET_1" }}
|
|
||||||
SAXO_APP_SECRET_2={{ key "mmd/SAXO_APP_SECRET_2" }}
|
|
||||||
SAXO_BASE={{ key "mmd/SAXO_BASE" }}
|
|
||||||
SAXO_AUTH_URL={{ key "mmd/SAXO_AUTH_URL" }}
|
|
||||||
SAXO_TOKEN_URL={{ key "mmd/SAXO_TOKEN_URL" }}
|
|
||||||
SAXO_REDIRECT={{ key "mmd/SAXO_REDIRECT" }}
|
|
||||||
EOF
|
|
||||||
destination = "secrets/app.env"
|
|
||||||
env = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resources {
|
resources {
|
||||||
@@ -136,22 +125,11 @@ EOF
|
|||||||
LOG_DIR = "/app/data/logs"
|
LOG_DIR = "/app/data/logs"
|
||||||
SAXO_TOKEN_FILE = "/app/data/.saxo_token.json"
|
SAXO_TOKEN_FILE = "/app/data/.saxo_token.json"
|
||||||
HF_HOME = "/app/data/hf-cache"
|
HF_HOME = "/app/data/hf-cache"
|
||||||
}
|
DATABASE_URL = "__DATABASE_URL__"
|
||||||
|
ANTHROPIC_API_KEY = "__ANTHROPIC_API_KEY__"
|
||||||
template {
|
SAXO_APP_KEY = "__SAXO_APP_KEY__"
|
||||||
data = <<EOF
|
SAXO_APP_SECRET_1 = "__SAXO_APP_SECRET_1__"
|
||||||
DATABASE_URL={{ key "mmd/DATABASE_URL" }}
|
SAXO_BASE = "__SAXO_BASE__"
|
||||||
ANTHROPIC_API_KEY={{ key "mmd/anthropic_api_key" }}
|
|
||||||
SAXO_APP_KEY={{ key "mmd/SAXO_APP_KEY" }}
|
|
||||||
SAXO_APP_SECRET_1={{ key "mmd/SAXO_APP_SECRET_1" }}
|
|
||||||
SAXO_APP_SECRET_2={{ key "mmd/SAXO_APP_SECRET_2" }}
|
|
||||||
SAXO_BASE={{ key "mmd/SAXO_BASE" }}
|
|
||||||
SAXO_AUTH_URL={{ key "mmd/SAXO_AUTH_URL" }}
|
|
||||||
SAXO_TOKEN_URL={{ key "mmd/SAXO_TOKEN_URL" }}
|
|
||||||
SAXO_REDIRECT={{ key "mmd/SAXO_REDIRECT" }}
|
|
||||||
EOF
|
|
||||||
destination = "secrets/app.env"
|
|
||||||
env = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resources {
|
resources {
|
||||||
|
|||||||
Reference in New Issue
Block a user