Skip to content

Commit abf340b

Browse files
quotentirolerquotentiroler
committed
Merge branch 'develop' into test
2 parents 1957b68 + 57ed835 commit abf340b

19 files changed

Lines changed: 67 additions & 46 deletions

File tree

‎.github/workflows/deploy-beta.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262

6363
- name: Configure SSH
6464
env:
65-
SSH_PRIVATE_KEY: ${{ secrets.VPS_SSH_KEY }}
65+
VPS_SSH_KEY: ${{ secrets.VPS_SSH_KEY }}
6666
run: |
6767
mkdir -p ~/.ssh
68-
echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
69-
chmod 600 ~/.ssh/deploy_key
68+
install -m 600 /dev/null ~/.ssh/deploy_key
69+
echo "$VPS_SSH_KEY" > ~/.ssh/deploy_key
7070
ssh-keyscan -H ${{ secrets.VPS_HOST }} >> ~/.ssh/known_hosts
7171
7272
- name: Deploy via Docker Compose
@@ -83,7 +83,7 @@ jobs:
8383
8484
DEPLOY_DIR="/opt/proxy-smart-beta"
8585
VPS_URL="https://beta.proxy-smart.com"
86-
SSH_CMD="ssh -i ~/.ssh/deploy_key -o StrictHostKeyChecking=no ${VPS_USER}@${VPS_HOST}"
86+
SSH_CMD="ssh -i ~/.ssh/deploy_key -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o ServerAliveCountMax=10 ${VPS_USER}@${VPS_HOST}"
8787
8888
# Ensure deploy directory and repo exist on VPS
8989
${SSH_CMD} "
@@ -114,7 +114,7 @@ jobs:
114114
115115
# Ensure shared Caddy proxy is running
116116
docker network create caddy 2>/dev/null || true
117-
docker compose -f docker-compose.caddy.yml up -d
117+
docker compose -p caddy-proxy -f docker-compose.caddy.yml up -d
118118
119119
echo '📦 Rebuilding and restarting beta stack...'
120120
docker compose -f docker-compose.beta.yml --env-file .env.beta pull postgres

‎backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "proxy-smart-backend",
33
"displayName": "Proxy Smart Backend",
4-
"version": "0.0.2-beta.202603230612.99d12dbe",
4+
"version": "0.0.2-alpha.202603230622.14bbce86",
55
"type": "module",
66
"scripts": {
77
"test": "bun test",

‎backend/public/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<link rel="icon" type="image/svg+xml" href="/proxy-smart.svg" />
67
<title>Proxy Smart — SMART on FHIR Proxy</title>
78
<meta name="description" content="Open-source stateless proxy that adds OAuth 2.0 and SMART App Launch 2.2.0 authorization to any FHIR server." />
89
<meta name="theme-color" content="#000000" />

‎consent-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Proxy Smart Consent App",
44
"description": "SMART on FHIR consent management app — manage FHIR Consent resources for linked Patient records.",
55
"private": true,
6-
"version": "0.0.2-alpha.202603230557.e1664074",
6+
"version": "0.0.2-alpha.202603230614.2a199991",
77
"type": "module",
88
"scripts": {
99
"dev": "vite --port 5174",

‎dtr-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Proxy Smart DTR App",
44
"description": "Da Vinci DTR (Documentation Templates & Rules) — SMART on FHIR app for prior authorization documentation, questionnaire rendering, and CQL-based auto-population.",
55
"private": true,
6-
"version": "0.0.2-alpha.202603230557.e1664074",
6+
"version": "0.0.2-alpha.202603230614.2a199991",
77
"type": "module",
88
"scripts": {
99
"dev": "vite --port 5175",

‎infra/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "proxy-smart-infra",
33
"displayName": "Proxy Smart Infrastructure",
44
"description": "AWS CDK infrastructure for Proxy Smart production deployment",
5-
"version": "0.0.2-beta.202603230612.99d12dbe",
5+
"version": "0.0.2-alpha.202603230622.14bbce86",
66
"private": true,
77
"type": "module",
88
"scripts": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "proxy-smart",
3-
"version": "0.0.2-beta.202603230612.99d12dbe",
3+
"version": "0.0.2-alpha.202603230622.14bbce86",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/quotentiroler/proxy-smart.git"

‎scripts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "proxy-smart-scripts",
3-
"version": "0.0.2-beta.202603230612.99d12dbe",
3+
"version": "0.0.2-alpha.202603230622.14bbce86",
44
"description": "CI/CD and development scripts for Proxy Smart",
55
"private": true,
66
"type": "module",

‎shared-ui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@proxy-smart/shared-ui",
3-
"version": "0.0.2-alpha.202603230557.e1664074",
3+
"version": "0.0.2-alpha.202603230614.2a199991",
44
"private": true,
55
"type": "module",
66
"main": "./src/index.ts",

‎testing/beta/report/fhir-servers.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"error":"backend unreachable"}
1+

0 commit comments

Comments
 (0)