chore: remove unused files and redundant stages

coursekata · Mar 8, 2024 · c953ad1 · c953ad1
1 parent cb0aafc
commit c953ad1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 121 deletions.
diff --git a/base-r-notebook/Dockerfile b/base-r-notebook/Dockerfile
@@ -66,12 +66,3 @@ RUN --mount=type=cache,target=${CONDA_DIR}/pkgs,uid=${NB_UID},sharing=locked \
 
 # add R mimetype and networking options
 COPY --chown=${NB_UID}:${NB_GID} Rprofile.site "${R_HOME}"/etc/
-
-# add common utilities
-USER root
-COPY --chmod=555 bin/ /usr/local/bin/
-RUN chmod 555 \
-  /usr/local/bin/find-shared-libs \
-  /usr/local/bin/diff-shared-libs \
-  /usr/local/bin/copy-shared-libs
-USER ${NB_UID}
diff --git a/base-r-notebook/bin/copy-shared-libs b/base-r-notebook/bin/copy-shared-libs
diff --git a/base-r-notebook/bin/diff-shared-libs b/base-r-notebook/bin/diff-shared-libs
diff --git a/base-r-notebook/bin/find-shared-libs b/base-r-notebook/bin/find-shared-libs
diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
@@ -15,26 +15,11 @@ ARG PIP_CACHE_DIR=/tmp/pip-cache
 ARG PIP_WHEEL_DIR=/tmp/pip-wheels
 ARG APT_CACHE_DIR=/var/cache/apt
 ARG APT_LIB_DIR=/var/lib/apt
-ARG SHARED_LIBS_LIST=/tmp/shared-libs.txt
-
-
-# base
-# -------------------------------------
-FROM ${PARENT_IMAGE} as base
-
-# install cmdstan dependencies
-USER root
-ARG APT_CACHE_DIR APT_LIB_DIR
-RUN --mount=type=cache,target="${APT_CACHE_DIR}",sharing=locked \
-  --mount=type=cache,target="${APT_LIB_DIR}",sharing=locked \
-  apt-get update && apt-get upgrade -y && apt-get -y install --no-install-recommends \
-  g++
-USER ${NB_UID}
 
 
 # py-builder
 # -------------------------------------
-FROM base as py-builder
+FROM ${PARENT_IMAGE} as py-builder
 
 RUN --mount=type=cache,target=${CONDA_DIR}/pkgs,uid=${NB_UID},sharing=locked \
   mamba install --yes "gdal"
@@ -49,7 +34,7 @@ RUN --mount=type=bind,source="${PY_REQUIREMENTS}",target=/tmp/requirements.txt \
 
 # final
 # -------------------------------------
-FROM base
+FROM ${PARENT_IMAGE} as base
 LABEL maintainer="CourseKata <[email protected]>"
 
 # install cmdstan and related requests

diff --git a/essentials-notebook/Dockerfile b/essentials-notebook/Dockerfile
@@ -16,7 +16,6 @@ ARG PIP_CACHE_DIR=/tmp/pip-cache
 ARG PIP_WHEEL_DIR=/tmp/pip-wheels
 ARG APT_CACHE_DIR=/var/cache/apt
 ARG APT_LIB_DIR=/var/lib/apt
-ARG SHARED_LIBS_LIST=/tmp/shared-libs.txt
 
 
 # py-builder

diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
@@ -17,7 +17,6 @@ ARG PIP_CACHE_DIR=/tmp/pip-cache
 ARG PIP_WHEEL_DIR=/tmp/pip-wheels
 ARG APT_CACHE_DIR=/var/cache/apt
 ARG APT_LIB_DIR=/var/lib/apt
-ARG SHARED_LIBS_LIST=/tmp/shared-libs.txt
 
 
 # py-builder