Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GIT_CLONE_PROTECTION_ACTIVE env config to fix build script #1748

Merged
merged 4 commits into from
Jun 25, 2024
Merged

Add GIT_CLONE_PROTECTION_ACTIVE env config to fix build script #1748

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a42900a
Add GIT_CLONE_PROTECTION_ACTIVE env config to fix build script
jadu-nv Jun 18, 2024
c4ada93
Update tags to adhere to CI requirements
jadu-nv Jun 18, 2024
d70c395
Revert changes made to morpheus version
jadu-nv Jun 25, 2024
84bcdc8
Merge branch 'branch-24.06' into jadu-build-container-release-fix
dagardner-nv Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ morpheus_utils_initialize_cuda_arch(morpheus)
# Note intentionally excluding CUDA from the LANGUAGES list allowing us to set some clang specific settings later when
# we call morpheus_utils_enable_cuda()
project(morpheus
VERSION 24.06.00
VERSION 24.06.00rc1
jadu-nv marked this conversation as resolved.
Show resolved Hide resolved
LANGUAGES C CXX
)

Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ ARG MORPHEUS_ROOT_HOST
ARG CUDA_MAJOR_VER
ARG CUDA_MINOR_VER

ENV GIT_CLONE_PROTECTION_ACTIVE=false

RUN --mount=type=cache,id=apt,target=/var/cache/apt \
apt update && \
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
Expand Down
2 changes: 1 addition & 1 deletion examples/digital_fingerprinting/production/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

ARG MORPHEUS_CONTAINER=nvcr.io/nvidia/morpheus/morpheus
ARG MORPHEUS_CONTAINER_VERSION=v24.06.00-runtime
ARG MORPHEUS_CONTAINER_VERSION=v24.06.00rc1-runtime
jadu-nv marked this conversation as resolved.
Show resolved Hide resolved

FROM ${MORPHEUS_CONTAINER}:${MORPHEUS_CONTAINER_VERSION} as base

Expand Down
4 changes: 2 additions & 2 deletions examples/digital_fingerprinting/production/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
target: jupyter
args:
- MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus}
- MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime}
- MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime}
deploy:
resources:
reservations:
Expand Down Expand Up @@ -109,7 +109,7 @@ services:
target: runtime
args:
- MORPHEUS_CONTAINER=${MORPHEUS_CONTAINER:-nvcr.io/nvidia/morpheus/morpheus}
- MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00-runtime}
- MORPHEUS_CONTAINER_VERSION=${MORPHEUS_CONTAINER_VERSION:-v24.06.00rc1-runtime}
jadu-nv marked this conversation as resolved.
Show resolved Hide resolved
image: dfp_morpheus
container_name: morpheus_pipeline
deploy:
Expand Down
Loading