- First round of fixes for RC1
All checks were successful
Chore App Build and Push Docker Images / build-and-push (push) Successful in 2m18s
All checks were successful
Chore App Build and Push Docker Images / build-and-push (push) Successful in 2m18s
This commit is contained in:
@@ -58,6 +58,9 @@ jobs:
|
|||||||
if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then
|
if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then
|
||||||
docker tag git.ryankegel.com:3000/ryan/backend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/backend:latest
|
docker tag git.ryankegel.com:3000/ryan/backend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/backend:latest
|
||||||
docker push git.ryankegel.com:3000/ryan/backend:latest
|
docker push git.ryankegel.com:3000/ryan/backend:latest
|
||||||
|
elif [ "${{ gitea.ref }}" == "refs/heads/next" ]; then
|
||||||
|
docker tag git.ryankegel.com:3000/ryan/backend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/backend:next
|
||||||
|
docker push git.ryankegel.com:3000/ryan/backend:next
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Push Frontend Image to Gitea Registry
|
- name: Push Frontend Image to Gitea Registry
|
||||||
@@ -79,6 +82,9 @@ jobs:
|
|||||||
if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then
|
if [ "${{ gitea.ref }}" == "refs/heads/master" ]; then
|
||||||
docker tag git.ryankegel.com:3000/ryan/frontend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/frontend:latest
|
docker tag git.ryankegel.com:3000/ryan/frontend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/frontend:latest
|
||||||
docker push git.ryankegel.com:3000/ryan/frontend:latest
|
docker push git.ryankegel.com:3000/ryan/frontend:latest
|
||||||
|
elif [ "${{ gitea.ref }}" == "refs/heads/next" ]; then
|
||||||
|
docker tag git.ryankegel.com:3000/ryan/frontend:${{ steps.vars.outputs.tag }} git.ryankegel.com:3000/ryan/frontend:next
|
||||||
|
docker push git.ryankegel.com:3000/ryan/frontend:next
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Deploy Test Environment
|
- name: Deploy Test Environment
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# file: config/version.py
|
# file: config/version.py
|
||||||
import os
|
import os
|
||||||
|
|
||||||
BASE_VERSION = "1.0.4" # update manually when releasing features
|
BASE_VERSION = "1.0.4RC2" # update manually when releasing features
|
||||||
|
|
||||||
def get_full_version() -> str:
|
def get_full_version() -> str:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
from flask import Flask, request, jsonify
|
from flask import Flask, request, jsonify
|
||||||
from flask_cors import CORS
|
from flask_cors import CORS
|
||||||
@@ -49,7 +50,7 @@ app.config.update(
|
|||||||
MAIL_USERNAME='ryan.kegel@gmail.com',
|
MAIL_USERNAME='ryan.kegel@gmail.com',
|
||||||
MAIL_PASSWORD='ruyj hxjf nmrz buar',
|
MAIL_PASSWORD='ruyj hxjf nmrz buar',
|
||||||
MAIL_DEFAULT_SENDER='ryan.kegel@gmail.com',
|
MAIL_DEFAULT_SENDER='ryan.kegel@gmail.com',
|
||||||
FRONTEND_URL='https://localhost:5173', # Adjust as needed
|
FRONTEND_URL=os.environ.get('FRONTEND_URL', 'https://localhost:5173'), # Dynamic via env var, defaults to localhost
|
||||||
SECRET_KEY='supersecretkey' # Replace with a secure key in production
|
SECRET_KEY='supersecretkey' # Replace with a secure key in production
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -3,15 +3,16 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
chore-test-app-backend: # Test backend service name
|
chore-test-app-backend: # Test backend service name
|
||||||
image: git.ryankegel.com:3000/ryan/backend:next-1.0.4-20260211 # Use dev tag
|
image: git.ryankegel.com:3000/ryan/backend:next # Use latest next tag
|
||||||
ports:
|
ports:
|
||||||
- "5004:5000" # Host 5004 -> Container 5000
|
- "5004:5000" # Host 5004 -> Container 5000
|
||||||
environment:
|
environment:
|
||||||
- FLASK_ENV=development
|
- FLASK_ENV=development
|
||||||
|
- FRONTEND_URL=https://devserver.lan:446 # Add this for test env
|
||||||
# Add volumes, networks, etc., as needed
|
# Add volumes, networks, etc., as needed
|
||||||
|
|
||||||
chore-test-app-frontend: # Test frontend service name
|
chore-test-app-frontend: # Test frontend service name
|
||||||
image: git.ryankegel.com:3000/ryan/frontend:next-1.0.4-20260211 # Use dev tag
|
image: git.ryankegel.com:3000/ryan/frontend:next # Use latest next tag
|
||||||
ports:
|
ports:
|
||||||
- "446:443" # Host 446 -> Container 443 (HTTPS)
|
- "446:443" # Host 446 -> Container 443 (HTTPS)
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
--fab-hover-bg: #5a67d8;
|
--fab-hover-bg: #5a67d8;
|
||||||
--fab-active-bg: #4c51bf;
|
--fab-active-bg: #4c51bf;
|
||||||
--message-block-color: #fdfdfd;
|
--message-block-color: #fdfdfd;
|
||||||
--sub-message-color: #c1d0f1;
|
--sub-message-color: #9eaac4;
|
||||||
--sign-in-btn-bg: #fff;
|
--sign-in-btn-bg: #fff;
|
||||||
--sign-in-btn-color: #2563eb;
|
--sign-in-btn-color: #2563eb;
|
||||||
--sign-in-btn-border: #2563eb;
|
--sign-in-btn-border: #2563eb;
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
>. Please open the email and follow the instructions to verify your account.
|
>. Please open the email and follow the instructions to verify your account.
|
||||||
</p>
|
</p>
|
||||||
<div class="card-actions">
|
<div class="card-actions">
|
||||||
<button class="form-btn" @click="goToLogin">Go to Sign In</button>
|
<button class="btn btn-primary" @click="goToLogin">Sign In</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user