From ceeddcedbfab91948205be034db3879c6beb7bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Percy=20Camilo=20Trive=C3=B1o=20Aucahuasi?= Date: Fri, 12 Jul 2024 20:22:10 -0500 Subject: [PATCH] update CUDA and graphistry version --- .github/workflows/dockerhubpublish.yml | 2 +- .github/workflows/scan.yml | 4 ++-- src/docker/Dockerfile | 6 +++--- src/docker/docker-compose.yml | 6 +++--- src/docker/override/docker-compose.override.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerhubpublish.yml b/.github/workflows/dockerhubpublish.yml index e632a81..049caca 100644 --- a/.github/workflows/dockerhubpublish.yml +++ b/.github/workflows/dockerhubpublish.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest-4-cores strategy: matrix: - CUDA_SHORT_VERSION: ['11.5'] + CUDA_SHORT_VERSION: ['11.8'] fail-fast: true diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index c7ff0bf..b49eb79 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -31,7 +31,7 @@ jobs: DOCKER_BUILDKIT: 1 strategy: matrix: - CUDA_SHORT_VERSION: ['11.5'] + CUDA_SHORT_VERSION: ['11.8'] steps: - name: checkout @@ -94,7 +94,7 @@ jobs: DOCKER_BUILDKIT: 1 strategy: matrix: - CUDA_SHORT_VERSION: ['11.5'] + CUDA_SHORT_VERSION: ['11.8'] steps: - name: checkout diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 161e7e1..c16aff5 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -1,12 +1,12 @@ # Default to big image, but allow thin cpu override ARG DOCKER_TAG=latest -ARG GRAPHISTRY_FORGE_BASE_VERSION=v2.40.67-11.5 -ARG PYTHON_VERSION=3.8 +ARG GRAPHISTRY_FORGE_BASE_VERSION=v2.41.0-11.8 +ARG PYTHON_VERSION=3.10 ARG BASE_IMAGE=graphistry/graphistry-forge-base:${GRAPHISTRY_FORGE_BASE_VERSION} FROM python:$PYTHON_VERSION as cpu_base ARG DOCKER_TAG=latest -ARG GRAPHISTRY_FORGE_BASE_VERSION=v2.40.67-11.5 +ARG GRAPHISTRY_FORGE_BASE_VERSION=v2.41.0-11.8 ARG BASE_IMAGE=graphistry/graphistry-forge-base:${GRAPHISTRY_FORGE_BASE_VERSION} FROM $BASE_IMAGE diff --git a/src/docker/docker-compose.yml b/src/docker/docker-compose.yml index 8a4aadd..a74018d 100644 --- a/src/docker/docker-compose.yml +++ b/src/docker/docker-compose.yml @@ -56,7 +56,7 @@ x-build-kwargs: args: - DOCKER_TAG=${DOCKER_TAG:-latest} - BUILDKIT_INLINE_CACHE=1 - - GRAPHISTRY_FORGE_BASE_VERSION=${GRAPHISTRY_FORGE_BASE_VERSION:-v2.40.67-11.5} + - GRAPHISTRY_FORGE_BASE_VERSION=${GRAPHISTRY_FORGE_BASE_VERSION:-v2.41.0-11.8} ############################################################ ## @@ -70,14 +70,14 @@ services: environment: PYTHONPATH: "/opt/py_env" PIP_TARGET: "/opt/py_env" - image: graphistry/graph-app-kit-st:${DOCKER_TAG:-latest}-${CUDA_SHORT_VERSION:-11.5} + image: graphistry/graph-app-kit-st:${DOCKER_TAG:-latest}-${CUDA_SHORT_VERSION:-11.8} command: --server.baseUrlPath="$BASE_PATH" /apps/entrypoint.py build: <<: *build_kwargs context: .. dockerfile: ./docker/Dockerfile cache_from: - - graphistry/graph-app-kit-st:${DOCKER_TAG:-latest}-${CUDA_SHORT_VERSION:-11.5} + - graphistry/graph-app-kit-st:${DOCKER_TAG:-latest}-${CUDA_SHORT_VERSION:-11.8} ports: - "${ST_PUBLIC_PORT:-8501}:8501" volumes: diff --git a/src/docker/override/docker-compose.override.yml b/src/docker/override/docker-compose.override.yml index 124655a..37bd61a 100644 --- a/src/docker/override/docker-compose.override.yml +++ b/src/docker/override/docker-compose.override.yml @@ -54,7 +54,7 @@ services: args: - DOCKER_TAG=${DOCKER_TAG:-latest} - BUILDKIT_INLINE_CACHE=1 - - GRAPHISTRY_FORGE_BASE_VERSION=${GRAPHISTRY_FORGE_BASE_VERSION:-v2.40.67-11.5} + - GRAPHISTRY_FORGE_BASE_VERSION=${GRAPHISTRY_FORGE_BASE_VERSION:-v2.41.0-11.8} context: .. dockerfile: ./docker/Dockerfile cache_from: