1.0.80

.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 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

@@ -1,4 +1,4 @@
-FROM docker:19.03.1
+FROM docker:20.10.8
 
 RUN apk update && apk add --no-cache \
   git \
@@ -9,20 +9,23 @@ RUN apk update && apk add --no-cache \
   make \
   gcc \
   g++ \
-  python \
+  python3 \
+  py3-pip \
   linux-headers \
   paxctl \
   libgcc \
   libstdc++ \
   gnupg \
   nodejs-current \
-  nodejs-npm \
+  npm \
   krb5-libs \
   && update-ca-certificates
 
 # Add the patch fix
 COPY ./stack-fix.c /lib/
 
+RUN node -v && npm -v
+
 # Prepare the libraries packages
 RUN set -ex \
     && apk add --no-cache  --virtual .build-deps build-base \
@@ -33,8 +36,9 @@ 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 rust=1.50.0-r0 python3 && \
+    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

package-lock.json

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

package.json

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