Fix/minor (#209)

* Allow uninstalls installed on root path to be found by Docker. * Remove incorrect comment. * Remove unnecessary dependencies. * Fix maintainer quote inconsistency. --------- Co-authored-by: joonhyung.lee <[email protected]>
cresset-template · Aug 14, 2024 · 79bb9b6 · 79bb9b6
1 parent d8af01b
commit 79bb9b6
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 8 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -9,4 +9,5 @@
 !**/*environment*.yaml
 !*conda-lock*.yaml
 !**/*conda-lock*.yaml
+!*uninstalls*.txt
 !**/*uninstalls*.txt
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -90,7 +90,6 @@ services:
         UID: ${UID:-1000}
         GRP: ${GRP:-user}
         USR: ${USR:-user}
-        # `TZ` is placed here even if not used for consistency with the runtime.
         TZ: ${TZ:-UTC}
         # Change the `CONDA_URL` for different hardware architectures.
         # URLs from https://github.com/conda-forge/miniforge are recommended over

diff --git a/dockerfiles/ngc.Dockerfile b/dockerfiles/ngc.Dockerfile
@@ -33,7 +33,7 @@ FROM ${BASE_IMAGE} AS install-conda
 # those in the NGC image, which have been carefully configured.
 # NGC images prior to 22.11 are **incompatible** with the current Dockerfile.
 
-LABEL [email protected]
+LABEL maintainer="[email protected]"
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 ENV PYTHONIOENCODING=UTF-8

diff --git a/dockerfiles/simple.Dockerfile b/dockerfiles/simple.Dockerfile
@@ -20,7 +20,7 @@ ARG GIT_IMAGE=bitnami/git:latest
 ########################################################################
 FROM ${GIT_IMAGE} AS stash
 
-LABEL [email protected]
+LABEL maintainer="[email protected]"
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 ENV PYTHONIOENCODING=UTF-8

diff --git a/dockerfiles/train.Dockerfile b/dockerfiles/train.Dockerfile
@@ -70,7 +70,7 @@ RUN curl -fksSL -o /tmp/conda/miniconda.sh ${CONDA_URL}
 ########################################################################
 FROM ${BUILD_IMAGE} AS install-conda
 
-LABEL [email protected]
+LABEL maintainer="[email protected]"
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 

diff --git a/reqs/ngc-apt.requirements.txt b/reqs/ngc-apt.requirements.txt
@@ -1,4 +1,3 @@
-gdb
 sudo
 tmux
 tzdata

diff --git a/reqs/ngc-environment.yaml b/reqs/ngc-environment.yaml
@@ -8,10 +8,8 @@ channels:
   - nodefaults # Do not use the default channel.
   - conda-forge # Always use conda-forge instead.
 dependencies: # Use conda packages if possible.
-  - gdb
   - hydra-core
   - jemalloc
-  - lldb
 
   # For `pip` dependencies that are not available in conda.
   - pip

diff --git a/reqs/simple-apt.requirements.txt b/reqs/simple-apt.requirements.txt
@@ -1,5 +1,4 @@
 # `openssl`, `sudo`, and `zsh` are required packages.
-at
 curl
 git
 openssl
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
-    gdb
     sudo
     tmux
     tzdata
@@ Expand Down @@