Skip to content

Commit

Permalink
Merge pull request #2 from dillon-cullinan/fix-dockerci
Browse files Browse the repository at this point in the history
[WIP] FIX CI Testing and Updates for Github Migration
  • Loading branch information
dillon-cullinan authored Aug 23, 2021
2 parents cf4c427 + 2c6f7ba commit 519dad5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "models"]
path = models
url = ../../morpheus/morpheus-models.git
url = ./../Morpheus-Models
branch = branch-0.1-EA
4 changes: 2 additions & 2 deletions ci/gpu/build.sh → ci/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ gpuci_logger ">>>> END Dockerfile <<<<"

# Get build info ready
gpuci_logger "Preparing build config..."
BUILD_TAG="cuda${CUDA_VER}-${LINUX_VER}-py${PYTHON_VER}"
BUILD_TAG="cuda${CUDA}-${LINUX_VER}-py${PYTHON_VER}"

# Setup initial BUILD_ARGS
BUILD_ARGS="--no-cache \
--build-arg CUDA_VER=${CUDA_VER} \
--build-arg CUDA_VER=${CUDA} \
--build-arg LINUX_VER=${LINUX_VER} \
--build-arg PYTHON_VER=${PYTHON_VER}"

Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ SHELL ["/bin/bash", "-c"]
# All code will be under /workspace
WORKDIR /workspace

RUN /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy
RUN conda config --set ssl_verify false \
&& /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy

COPY docker/conda/environments/dev_cuda${CUDA_VER}.yml ./docker/conda/environments/

Expand Down
1 change: 1 addition & 0 deletions models
Submodule models added at 7d8761

0 comments on commit 519dad5

Please sign in to comment.