diff --git a/Dockerfile b/Dockerfile index c8edb77ee..0a4257f7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,6 @@ COPY . /workspace/ COPY build_info.txt /workspace/ -COPY git_hash.txt /workspace/ - RUN cd /workspace && ./docker_build_script_ubuntu.sh RUN chmod -R a+rwx /workspace diff --git a/Makefile b/Makefile index a7f0ba761..a066c891b 100644 --- a/Makefile +++ b/Makefile @@ -52,11 +52,8 @@ build_info.txt: @echo "build_user=\"`id -u -n`\"" >> $@ @echo "base_version=\"$(PACKAGE_VERSION)\"" >> $@ -git_hash.txt: - @echo "$(shell git rev-parse HEAD)" >> $@ - -docker_build: build_info.txt git_hash.txt +docker_build: build_info.txt ifeq ($(shell curl --connect-timeout 4 --write-out %{http_code} -sS --output /dev/null -X GET https://gcr.io/v2/vorvan/h2oai/h2oai-h2ogpt-runtime/manifests/$(BUILD_TAG)),200) @echo "Image already pushed to GCR: $(DOCKER_H2OGPT_RUNTIME_IMAGE)" docker pull $(DOCKER_H2OGPT_RUNTIME_IMAGE) diff --git a/docker_build_script_ubuntu.sh b/docker_build_script_ubuntu.sh index 5759eff16..76e103e06 100755 --- a/docker_build_script_ubuntu.sh +++ b/docker_build_script_ubuntu.sh @@ -98,7 +98,6 @@ pip install https://h2o-release.s3.amazonaws.com/h2ogpt/open_webui-0.3.8-py3-non # Track build info cp /workspace/build_info.txt /build_info.txt -cp /workspace/git_hash.txt /git_hash.txt mkdir -p /workspace/save chmod -R a+rwx /workspace/save diff --git a/src/utils.py b/src/utils.py index 0a2883e2c..59e7ad104 100644 --- a/src/utils.py +++ b/src/utils.py @@ -408,13 +408,6 @@ def get_githash(): githash = git_hash_unset except Exception as e: print("git failed to run: %s" % str(e)) - if githash == git_hash_unset: - try: - with open('git_hash.txt', 'rt') as f: - githash = f.read().strip() - except Exception as e: - print("git_hash.txt failed to be found: %s" % str(e)) - if githash == git_hash_unset: try: from version import __version__ diff --git a/src/version.py b/src/version.py index 4ec1da98a..7079c03e2 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -__version__ = "3618868401689179d98c95be3ecdcc64d44d2acd" +__version__ = "4a8bda6fe1edf8ed37f619b250f66b11bd1b49c7"