1.0.84

.gitlab-ci.yml

@@ -6,8 +6,8 @@ services:
 before_script:
 - apk update
 - apk add --no-cache git openssl ca-certificates bash curl
-- apk add --no-cache make gcc g++ python linux-headers paxctl
-- apk add --no-cache libgcc libstdc++ gnupg nodejs-current nodejs-npm
+- apk add --no-cache make gcc g++ python3 py3-pip linux-headers paxctl
+- apk add --no-cache libgcc libstdc++ gnupg nodejs-current npm
 - update-ca-certificates
 - cp ./stack-fix.c /lib/
 - set -ex

Dockerfile

@@ -3,13 +3,16 @@ FROM docker:20.10.8
 RUN apk update && apk add --no-cache \
   git \
   openssl \
+  openssl-dev \
   ca-certificates \
   bash \
   curl \
   make \
   gcc \
   g++ \
-  python \
+  python3 \
+  python3-dev \
+  py3-pip \
   linux-headers \
   paxctl \
   libgcc \
@@ -18,13 +21,31 @@ RUN apk update && apk add --no-cache \
   nodejs-current \
   npm \
   krb5-libs \
-  && update-ca-certificates
+  && update-ca-certificates \
+  rust \
+  docker-cli \
+  libffi-dev \
+  libc-dev \
+  docker-compose
+
+RUN apk update && apk add bash libc6-compat alpine-sdk
+ENV PYTHONUNBUFFERED=1
+RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
+RUN python3 -m ensurepip
+RUN pip3 install --no-cache --upgrade pip setuptools
 
 # Add the patch fix
 COPY ./stack-fix.c /lib/
 
 RUN node -v && npm -v
 
+#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 pnpm -v
+
 # Prepare the libraries packages
 RUN set -ex \
     && apk add --no-cache  --virtual .build-deps build-base \
@@ -35,10 +56,3 @@ RUN set -ex \
 ENV LD_PRELOAD /lib/stack-fix.so
 
 RUN npm config set unsafe-perm true
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
-RUN apk update && \
-    apk add --no-cache docker-cli python3 && \
-    apk add --no-cache --virtual .docker-compose-deps python3-dev libffi-dev openssl-dev gcc libc-dev make && \
-    pip3 install docker-compose && \
-    apk del .docker-compose-deps
-

Dockerfile_npmci

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

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-dbase",
-  "version": "1.0.79",
+  "version": "1.0.84",
   "description": "easy CI for docker images",
   "main": "index.js",
   "directories": {