Dockerfile_dind

@@ -1,7 +1,5 @@
-# Stage 1: Build Stage
+FROM docker:dind
-FROM docker:dind as build-stage
 
-# Install necessary build tools and dependencies
 RUN apk update && apk add --no-cache \
   git \
   openssl \
@@ -23,28 +21,30 @@ RUN apk update && apk add --no-cache \
   nodejs-current \
   npm \
   krb5-libs \
+  && update-ca-certificates \
   rust \
   docker-cli \
   libffi-dev \
   libc-dev \
-  docker-compose \
+  docker-compose
-  libc6-compat \
-  alpine-sdk \
-  && update-ca-certificates
 
-# Ensure Python is correctly installed and upgrade pip
+RUN apk update && apk add bash libc6-compat alpine-sdk
 ENV PYTHONUNBUFFERED=1
-RUN ln -sf python3 /usr/bin/python && \
+RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
-  apk add --no-cache py3-pip py3-setuptools
+RUN python3 -m ensurepip
+RUN pip3 install --no-cache --upgrade pip setuptools
 
 # Add the patch fix
 COPY ./stack-fix.c /lib/
 
-# Install pnpm
+RUN node -v && npm -v
-ENV PNPM_HOME="/root/.local/share/pnpm"
+
+#pnpm
+ENV PNPM_HOME="/root/.local/share/pnpm/pnpm"
 RUN mkdir -p ${PNPM_HOME}
 ENV PATH="$PNPM_HOME:$PATH"
-RUN curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm && chmod +x /bin/pnpm
+RUN curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; chmod +x /bin/pnpm;
+RUN pnpm -v
 
 # Prepare the libraries packages
 RUN set -ex \
@@ -52,62 +52,7 @@ RUN set -ex \
     && gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so \
     && apk del .build-deps
 
-# Export the environment variable of LD_PRELOAD
+# export the environment variable of LD_PRELOAD
 ENV LD_PRELOAD /lib/stack-fix.so
 
-# Validate installations
-RUN node -v && npm -v && pnpm -v
-RUN pnpm config set unsafe-perm true
-
-# Stage 2: Final Stage
-FROM docker:dind
-
-# Copy necessary files from build-stage
-COPY --from=build-stage /usr/bin/python3 /usr/bin/python3
-COPY --from=build-stage /usr/lib/python3.*/ /usr/lib/python3.*/
-COPY --from=build-stage /usr/bin/pip3 /usr/bin/pip3
-COPY --from=build-stage /lib/stack-fix.so /lib/stack-fix.so
-COPY --from=build-stage /bin/pnpm /bin/pnpm
-COPY --from=build-stage ${PNPM_HOME} ${PNPM_HOME}
-
-# Ensure CA certificates are up-to-date
-RUN apk update && apk add --no-cache \
-  git \
-  openssl \
-  openssl-dev \
-  ca-certificates \
-  bash \
-  curl \
-  make \
-  gcc \
-  g++ \
-  python3 \
-  python3-dev \
-  py3-pip \
-  linux-headers \
-  paxctl \
-  libgcc \
-  libstdc++ \
-  gnupg \
-  nodejs-current \
-  npm \
-  krb5-libs \
-  rust \
-  docker-cli \
-  libffi-dev \
-  libc-dev \
-  docker-compose \
-  libc6-compat \
-  alpine-sdk \
-  && update-ca-certificates
-
-# Re-set environment variables for final stage
-ENV PYTHONUNBUFFERED=1
-ENV PNPM_HOME="/root/.local/share/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-ENV LD_PRELOAD /lib/stack-fix.so
-
-# Validate installations in final stage
-RUN node -v && npm -v && pnpm -v
-
 RUN pnpm config set unsafe-perm true

Dockerfile_npmci

@@ -1,2 +1,2 @@
 FROM hosttoday/ht-docker-dbase:latest
-RUN pnpm install -g @ship.zone/npmci
+RUN pnpm install -g @shipzone/npmci

changelog.md

@@ -1,53 +0,0 @@
-# Changelog
-
-## 2024-11-17 - 1.0.93 - fix(documentation)
-Improve documentation with detailed setup and usage instructions
-
-- Added installation instructions for installing directly from GitLab.
-- Included a basic TypeScript usage example for setting up Docker continuous integration.
-- Outlined further configuration options and hypothetical usage of the package.
-
-## 2024-05-26 - 1.0.88 to 1.0.92 - Core Updates
-Routine maintenance and core updates.
-
-- Several updates to the core functionality to enhance stability and performance.
-
-## 2024-05-14 - 1.0.88 - Description Update
-Updated project description.
-
-- Modified the project description for clarity.
-
-## 2023-06-25 - 1.0.84 to 1.0.87 - Core Updates
-Routine core updates.
-
-- Implemented numerous updates to the project's core functionalities.
-
-## 2022-10-17 - 1.0.82 to 1.0.83 - Core Updates
-Routine maintenance for core systems.
-
-- Upgraded core components with several improvements.
-
-## 2022-01-28 - 1.0.75 to 1.0.81 - Core Updates
-Progressive updates and fixes in core functionalities.
-
-- Core systems improved with routine maintenance updates.
-
-## 2021-02-27 - 1.0.50 to 1.0.74 - Core Updates
-Round of fixes in the core components.
-
-- Enhanced core modules with crucial updates and fixes.
-
-## 2019-11-24 - 1.0.45 - Documentation Update
-Minor update to documentation.
-
-- README file renamed for better clarity in project documentation.
-
-## 2019-08-27 - 1.0.8 to 1.0.18 - Core Updates
-Ongoing maintenance with multiple core updates.
-
-- Maintained stable functionality with periodic core updates.
-
-## 2018-12-12 - 1.0.0 to 1.0.1 - Core Stabilization
-Initial version core stabilization.
-
-- Important fixes applied to core functions to ensure stability.

package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "ht-docker-dbase",
+  "version": "1.0.90",
+  "lockfileVersion": 1
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-dbase",
-  "version": "1.0.93",
+  "version": "1.0.90",
   "description": "Provides easy Continuous Integration for Docker images.",
   "main": "index.js",
   "directories": {

pnpm-lock.yaml

@@ -1,9 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .: {}