1.0.87

.gitlab-ci.yml

@@ -1,13 +1,13 @@
 # gitzone custom
-image: docker:19.03.1
+image: docker:20.10.8
 services:
   - docker:stable-dind
 
 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 make gcc g++ python3 py3-pip linux-headers paxctl
-- apk add --no-cache libgcc libstdc++ gnupg nodejs-current nodejs-npm
+- apk add --no-cache libgcc libstdc++ gnupg nodejs-current npm
 - update-ca-certificates
 - cp ./stack-fix.c /lib/
 - set -ex

Dockerfile

@@ -1,28 +1,51 @@
-FROM docker:19.03.1
+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 \
   libstdc++ \
   gnupg \
   nodejs-current \
-  nodejs-npm \
+  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 \
@@ -32,6 +55,4 @@ RUN set -ex \
 # export the environment variable of LD_PRELOAD
 ENV LD_PRELOAD /lib/stack-fix.so
 
-RUN npm config set unsafe-perm true
+RUN pnpm config set unsafe-perm true
-RUN apk add --update py-pip3 && pip3 install docker-compose
-

Dockerfile_dind

@@ -0,0 +1,58 @@
+FROM docker:20-dind
+
+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 \
+  && 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 \
+    && gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so \
+    && apk del .build-deps
+
+# export the environment variable of LD_PRELOAD
+ENV LD_PRELOAD /lib/stack-fix.so
+
+RUN pnpm config set unsafe-perm true

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.65",
+  "version": "1.0.87",
   "lockfileVersion": 1
 }

package.json

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

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}