forks/archivebox
1
0
Fork 0
Code Releases Activity

fix version string parsing

Browse source
This commit is contained in:
Nick Sweeting 2023-12-17 17:44:26 -08:00
parent d5f1411ed1
commit 4a4ed2cad6
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -279,7 +279,7 @@ RUN (echo -e "\n\n[√] Finished Docker build succesfully. Saving build summary
&& echo -e "PLATFORM=${TARGETPLATFORM} ARCH=$(uname -m) ($(uname -s) ${TARGETARCH} ${TARGETVARIANT})\n" \ && echo -e "PLATFORM=${TARGETPLATFORM} ARCH=$(uname -m) ($(uname -s) ${TARGETARCH} ${TARGETVARIANT})\n" \
&& echo -e "BUILD_END_TIME=$(date +"%Y-%m-%d %H:%M:%S %s")\n\n" \ && echo -e "BUILD_END_TIME=$(date +"%Y-%m-%d %H:%M:%S %s")\n\n" \
) | tee -a /VERSION.txt ) | tee -a /VERSION.txt
RUN "$CODE_DIR/bin/docker_entrypoint.sh" archivebox version 2>&1 | tee -a /VERSION.txt RUN "$CODE_DIR"/bin/docker_entrypoint.sh version 2>&1 | tee -a /VERSION.txt
#################################################### ####################################################

5
archivebox/config.py
View file

@ -431,7 +431,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
'DIR_OUTPUT_PERMISSIONS': {'default': lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')}, 'DIR_OUTPUT_PERMISSIONS': {'default': lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')},
'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0] or bin_path('archivebox')}, 'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0] or bin_path('archivebox')},
'VERSION': {'default': lambda c: get_version(c)}, 'VERSION': {'default': lambda c: get_version(c).split('+', 1)[0]},
'COMMIT_HASH': {'default': lambda c: get_commit_hash(c)}, 'COMMIT_HASH': {'default': lambda c: get_commit_hash(c)},
'BUILD_TIME': {'default': lambda c: get_build_time(c)}, 'BUILD_TIME': {'default': lambda c: get_build_time(c)},
@ -1298,8 +1298,7 @@ def setup_django(out_dir: Path=None, check_db=False, config: ConfigDict=CONFIG,
with open(settings.ERROR_LOG, "a", encoding='utf-8') as f: with open(settings.ERROR_LOG, "a", encoding='utf-8') as f:
command = ' '.join(sys.argv) command = ' '.join(sys.argv)
ts = datetime.now(timezone.utc).strftime('%Y-%m-%d__%H:%M:%S') ts = datetime.now(timezone.utc).strftime('%Y-%m-%d__%H:%M:%S')
f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n") f.write(f"\n> {command}; TS={ts} VERSION={config['VERSION']} IN_DOCKER={config['IN_DOCKER']} IS_TTY={config['IS_TTY']}\n")
if check_db: if check_db:
# Enable WAL mode in sqlite3 # Enable WAL mode in sqlite3

5
archivebox/main.py
View file

@ -94,6 +94,7 @@ from .config import (
ALLOWED_IN_OUTPUT_DIR, ALLOWED_IN_OUTPUT_DIR,
SEARCH_BACKEND_ENGINE, SEARCH_BACKEND_ENGINE,
LDAP, LDAP,
get_version,
check_dependencies, check_dependencies,
check_data_folder, check_data_folder,
write_config_file, write_config_file,
@ -216,7 +217,7 @@ def version(quiet: bool=False,
out_dir: Path=OUTPUT_DIR) -> None: out_dir: Path=OUTPUT_DIR) -> None:
"""Print the ArchiveBox version and dependency information""" """Print the ArchiveBox version and dependency information"""
print(VERSION.split('+')[0]) print(VERSION)
if not quiet: if not quiet:
# 0.7.1 # 0.7.1
@ -227,7 +228,7 @@ def version(quiet: bool=False,
p = platform.uname() p = platform.uname()
print( print(
'ArchiveBox v{}'.format(VERSION), 'ArchiveBox v{}'.format(get_version(CONFIG)),
*((f'COMMIT_HASH={COMMIT_HASH[:7]}',) if COMMIT_HASH else ()), *((f'COMMIT_HASH={COMMIT_HASH[:7]}',) if COMMIT_HASH else ()),
f'BUILD_TIME={BUILD_TIME}', f'BUILD_TIME={BUILD_TIME}',
) )

1
bin/docker_entrypoint.sh
View file

@ -6,7 +6,6 @@
# set -o xtrace # set -o xtrace
set -o errexit set -o errexit
set -o errtrace set -o errtrace
set -o nounset
set -o pipefail set -o pipefail
IFS=$'\n' IFS=$'\n'