diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c10af83..de09a763 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -120,7 +120,11 @@ jobs: - name: Prepare version file run: | - echo "${{ github.ref }}" > .version + BUILD_INFO_FILE=app/build_info.py + echo "SHA1 = '${{ github.ref }}'" > $BUILD_INFO_FILE + BUILD_TIME=$(date +%s) + echo "BUILD_TIME = '${BUILD_TIME}' >> $BUILD_INFO_FILE + cat $BUILD_INFO_FILE - name: Build image and publish to Docker Registry uses: docker/build-push-action@v3 diff --git a/app/build_info.py b/app/build_info.py new file mode 100644 index 00000000..c73f88ea --- /dev/null +++ b/app/build_info.py @@ -0,0 +1,2 @@ +SHA1 = "dev" +BUILD_TIME = "1652365083" diff --git a/app/config.py b/app/config.py index 44959066..ffa33701 100644 --- a/app/config.py +++ b/app/config.py @@ -2,29 +2,15 @@ import os import random import socket import string +from app import build_info from ast import literal_eval -from pathlib import Path from typing import Callable, List from urllib.parse import urlparse from dotenv import load_dotenv -DEFAULT_VERSION = "unknown" - -def load_version() -> str: - try: - this_file_path = Path(__file__) - root_dir_path = this_file_path.parent.parent - version_file_path = root_dir_path.joinpath(".version") - with open(version_file_path, "r") as f: - return f.readline().strip() - except Exception: - print("Could not load .version. Using default version") - return DEFAULT_VERSION - - -SHA1 = load_version() +SHA1 = build_info.SHA1 ROOT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))