Skip to content

Commit

Permalink
Merge pull request #118 from graphistry/dev/update-graphistry-cuda-ve…
Browse files Browse the repository at this point in the history
…rsion
  • Loading branch information
aucahuasi authored Jul 13, 2024
2 parents 344e3d0 + ceeddce commit bb076d4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerhubpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
DOCKER_BUILDKIT: 1
strategy:
matrix:
CUDA_SHORT_VERSION: ['11.5']
CUDA_SHORT_VERSION: ['11.8']
steps:

- name: checkout
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
DOCKER_BUILDKIT: 1
strategy:
matrix:
CUDA_SHORT_VERSION: ['11.5']
CUDA_SHORT_VERSION: ['11.8']
steps:

- name: checkout
Expand Down
6 changes: 3 additions & 3 deletions src/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}

############################################################
##
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/docker/override/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit bb076d4

Please sign in to comment.