.gitlab-ci.yml

@@ -11,7 +11,17 @@ docker-setup-and-processing-build:
     - docker:24.0.6-dind
   script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - docker build -f Dockerfile.minimal -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .
+    - >-
+      docker build -f Dockerfile.minimal
+                   -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}
+                   -t ${CI_REGISTRY_IMAGE}:latest
+                   --build-arg BUILD_TIME="$(date -uIseconds)"
+                   --build-arg GIT_COMMIT_SHA="$CI_COMMIT_SHA"
+                   --build-arg GIT_CURRENT_BRANCH="$CI_COMMIT_BRANCH"
+                   --build-arg GIT_LAST_LOG_MESSAGE="$CI_COMMIT_MESSAGE"
+                   --build-arg GIT_LAST_COMMITTER="$CI_COMMIT_AUTHOR"
+                   --build-arg GIT_LAST_COMMIT_DATE="$CI_COMMIT_TIMESTAMP"
+                   .
     - docker push --all-tags ${CI_REGISTRY_IMAGE}
   tags:
     - public-runner-docker

Dockerfile.minimal

@@ -34,3 +34,24 @@ COPY . .
 # Run the application
 ENTRYPOINT ["python", "-m", "jussi.serve"]
 CMD []
+
+ARG BUILD_TIME
+ARG GIT_COMMIT_SHA
+ARG GIT_CURRENT_BRANCH
+ARG GIT_LAST_LOG_MESSAGE
+ARG GIT_LAST_COMMITTER
+ARG GIT_LAST_COMMIT_DATE
+LABEL org.opencontainers.image.created="$BUILD_TIME"
+LABEL org.opencontainers.image.url="https://hive.io/"
+LABEL org.opencontainers.image.documentation="https://gitlab.syncad.com/hive/jussi"
+LABEL org.opencontainers.image.source="https://gitlab.syncad.com/hive/jussi"
+#LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.revision="$GIT_COMMIT_SHA"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.ref.name="Jussi"
+LABEL org.opencontainers.image.title="Jussi Reverse Proxy"
+LABEL org.opencontainers.image.description="A caching reverse proxy for JSON-RPC specifically designed to cache the Hive API"
+LABEL io.hive.image.branch="$GIT_CURRENT_BRANCH"
+LABEL io.hive.image.commit.log_message="$GIT_LAST_LOG_MESSAGE"
+LABEL io.hive.image.commit.author="$GIT_LAST_COMMITTER"
+LABEL io.hive.image.commit.date="$GIT_LAST_COMMIT_DATE"

jussi/handlers.py

@@ -105,7 +105,7 @@ async def monitor(http_request: HTTPRequest) -> HTTPResponse:
         for url, pool in pools.items():
             data = {
                 'url': url,
-                'queue': pool._queue.qsize,
+                'queue': pool._queue.qsize(),
                 'in_use': len([ch._in_use for ch in pool._holders if ch._in_use is not None]),
                 'ws_read_q_sizes': [ch._con.messages.qsize() for ch in pool._holders if ch._con]
             }