Loading .gitlab-ci.yml +1 −1 Original line number Original line Diff line number Diff line Loading @@ -43,7 +43,7 @@ build:docker:tags: script: script: - docker pull $CI_REGISTRY_IMAGE/env - docker pull $CI_REGISTRY_IMAGE/env - docker tag $CI_REGISTRY_IMAGE/env base-env-image - docker tag $CI_REGISTRY_IMAGE/env base-env-image - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker build --build-arg SEARXNG_GIT_VERSION="${CI_COMMIT_TAG}" -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG only: only: - tags - tags Loading Dockerfile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -67,6 +67,9 @@ ARG GIT_URL=unknown ARG SEARXNG_GIT_VERSION=unknown ARG SEARXNG_GIT_VERSION=unknown ARG LABEL_VCS_REF= ARG LABEL_VCS_REF= ARG LABEL_VCS_URL= ARG LABEL_VCS_URL= ENV SPOT_VERSION=${SEARXNG_GIT_VERSION} LABEL maintainer="searxng <${GIT_URL}>" \ LABEL maintainer="searxng <${GIT_URL}>" \ description="A privacy-respecting, hackable metasearch engine." \ description="A privacy-respecting, hackable metasearch engine." \ version="${SEARXNG_GIT_VERSION}" \ version="${SEARXNG_GIT_VERSION}" \ Loading searx/version.py +2 −2 Original line number Original line Diff line number Diff line Loading @@ -74,9 +74,9 @@ def get_git_version(): try: try: vf = version("spot") vf = os.environ["SPOT_VERSION"] VERSION_STRING = VERSION_TAG = vf VERSION_STRING = VERSION_TAG = vf except ImportError: except KeyError: try: try: try: try: VERSION_STRING, VERSION_TAG = get_git_version() VERSION_STRING, VERSION_TAG = get_git_version() Loading Loading
.gitlab-ci.yml +1 −1 Original line number Original line Diff line number Diff line Loading @@ -43,7 +43,7 @@ build:docker:tags: script: script: - docker pull $CI_REGISTRY_IMAGE/env - docker pull $CI_REGISTRY_IMAGE/env - docker tag $CI_REGISTRY_IMAGE/env base-env-image - docker tag $CI_REGISTRY_IMAGE/env base-env-image - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker build --build-arg SEARXNG_GIT_VERSION="${CI_COMMIT_TAG}" -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG only: only: - tags - tags Loading
Dockerfile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -67,6 +67,9 @@ ARG GIT_URL=unknown ARG SEARXNG_GIT_VERSION=unknown ARG SEARXNG_GIT_VERSION=unknown ARG LABEL_VCS_REF= ARG LABEL_VCS_REF= ARG LABEL_VCS_URL= ARG LABEL_VCS_URL= ENV SPOT_VERSION=${SEARXNG_GIT_VERSION} LABEL maintainer="searxng <${GIT_URL}>" \ LABEL maintainer="searxng <${GIT_URL}>" \ description="A privacy-respecting, hackable metasearch engine." \ description="A privacy-respecting, hackable metasearch engine." \ version="${SEARXNG_GIT_VERSION}" \ version="${SEARXNG_GIT_VERSION}" \ Loading
searx/version.py +2 −2 Original line number Original line Diff line number Diff line Loading @@ -74,9 +74,9 @@ def get_git_version(): try: try: vf = version("spot") vf = os.environ["SPOT_VERSION"] VERSION_STRING = VERSION_TAG = vf VERSION_STRING = VERSION_TAG = vf except ImportError: except KeyError: try: try: try: try: VERSION_STRING, VERSION_TAG = get_git_version() VERSION_STRING, VERSION_TAG = get_git_version() Loading