Adding Node 16 + Tweak alpine upgrade for python2

dbpolito · dbpolito · commit f0b96f894e80 · 2021-11-11T17:14:47.000-03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [10, 12, 14]
+        version: [10, 12, 14, 16]
         type: ['', '-qa']
 
     steps:
@@ -52,7 +52,7 @@ jobs:
             ${{ matrix.version }}-nest${{ matrix.type }}
 
       - name: Build (latest)
-        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '14'
+        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
         run: |
           if [ "${{ matrix.type }}" == "-qa" ]; then
             docker tag kooldev/node:${{ matrix.version }}-qa kooldev/node:qa
@@ -90,7 +90,7 @@ jobs:
           docker push kooldev/node:${{ matrix.version }}-nest${{ matrix.type }}
 
       - name: Push to DockerHub (latest)
-        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '14'
+        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
         run: |
           if [ "${{ matrix.type }}" == "-qa" ]; then
             docker push kooldev/node:qa
diff --git a/10/Dockerfile b/10/Dockerfile
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
         libpng-dev \
         make \
         zlib-dev \
-        python \
+        python2 \
     && npm install -g pnpm \
     && rm -rf rm -rf /root/.npm/*
 
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
         libpng-dev \
         make \
         zlib-dev \
-        python \
+        python2 \
     && npm install -g pnpm \
     && rm -rf rm -rf /root/.npm/*
 
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
         libpng-dev \
         make \
         zlib-dev \
-        python \
+        python2 \
     && npm install -g pnpm \
     && rm -rf rm -rf /root/.npm/*
 
diff --git a/16-adonis-qa/Dockerfile b/16-adonis-qa/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/node:16-adonis
+
+RUN npm install -g buddy.js jshint jsinspect eslint \
+    && rm -rf rm -rf /root/.npm/*
diff --git a/16-adonis/Dockerfile b/16-adonis/Dockerfile
@@ -0,0 +1,6 @@
+FROM kooldev/node:16
+
+RUN npm install -g @adonisjs/cli \
+    && rm -rf rm -rf /root/.npm/*
+
+CMD [ "npm", "run", "start" ]
diff --git a/16-nest-qa/Dockerfile b/16-nest-qa/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/node:16-nest
+
+RUN npm install -g buddy.js jshint jsinspect eslint \
+    && rm -rf rm -rf /root/.npm/*
diff --git a/16-nest/Dockerfile b/16-nest/Dockerfile
@@ -0,0 +1,6 @@
+FROM kooldev/node:16
+
+RUN npm install -g @nestjs/cli \
+    && rm -rf rm -rf /root/.npm/*
+
+CMD [ "npm", "run", "start" ]
diff --git a/16-qa/Dockerfile b/16-qa/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/node:16
+
+RUN npm install -g buddy.js jshint jsinspect eslint \
+    && rm -rf rm -rf /root/.npm/*
diff --git a/16/Dockerfile b/16/Dockerfile
@@ -0,0 +1,30 @@
+FROM node:16-alpine
+
+ENV ASUSER= \
+    UID=0 \
+    ENTRYPOINT=entrypoint.node.sh
+
+WORKDIR /app
+
+RUN adduser -D -u 1337 kool && deluser --remove-home node \
+    && apk add --no-cache \
+        bash \
+        git \
+        shadow \
+        su-exec \
+        # build tools
+        g++ \
+        libpng-dev \
+        make \
+        zlib-dev \
+        python2 \
+    && npm install -g pnpm \
+    && rm -rf rm -rf /root/.npm/*
+
+COPY root-npmrc /root/.npmrc
+COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
+COPY entrypoint /entrypoint
+
+RUN chmod +x /entrypoint
+
+ENTRYPOINT [ "/entrypoint" ]
diff --git a/16/entrypoint b/16/entrypoint
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+# Run as current user
+CURRENT_USER=${ASUSER:-${UID:-0}}
+
+if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
+    usermod -u $CURRENT_USER kool
+fi
+
+# Run entrypoint if provided
+if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
+    bash $ENTRYPOINT
+fi
+
+if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
+    exec su-exec kool "$@"
+else
+    exec "$@"
+fi
diff --git a/16/kool-npmrc b/16/kool-npmrc
@@ -0,0 +1,4 @@
+scripts-prepend-node-path=true
+package-import-method=copy
+shamefully-hoist=true
+store-dir=/home/kool/.pnpm-store
diff --git a/16/root-npmrc b/16/root-npmrc
@@ -0,0 +1,4 @@
+scripts-prepend-node-path=true
+package-import-method=copy
+shamefully-hoist=true
+store-dir=/root/.pnpm-store
diff --git a/build.sh b/build.sh
@@ -18,3 +18,10 @@ docker build -t kooldev/node:14-adonis 14-adonis
 docker build -t kooldev/node:14-adonis-qa 14-adonis-qa
 docker build -t kooldev/node:14-nest 14-nest
 docker build -t kooldev/node:14-nest-qa 14-nest-qa
+docker build --pull -t kooldev/node:16 16
+docker build -t kooldev/node:16-qa 16-qa
+docker build -t kooldev/node:16-adonis 16-adonis
+docker build -t kooldev/node:16-adonis-qa 16-adonis-qa
+docker build -t kooldev/node:16-nest 16-nest
+docker build -t kooldev/node:16-nest-qa 16-nest-qa
+
diff --git a/fwd-template.json b/fwd-template.json
@@ -288,6 +288,102 @@
                     "path": "template/Dockerfile-qa"
                 }
             ]
+        },
+        {
+            "name": "16",
+            "data": {
+                "from": "node:16-alpine",
+                "qa": false,
+                "version": "16"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                },
+                {
+                    "name": "entrypoint",
+                    "path": "template/entrypoint"
+                },
+                {
+                    "name": "kool-npmrc",
+                    "path": "template/kool-npmrc"
+                },
+                {
+                    "name": "root-npmrc",
+                    "path": "template/root-npmrc"
+                }
+            ]
+        },
+        {
+            "name": "16-qa",
+            "data": {
+                "from": "kooldev/node:16",
+                "qa": true,
+                "version": "16-qa"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-qa"
+                }
+            ]
+        },
+        {
+            "name": "16-adonis",
+            "data": {
+                "from": "kooldev/node:16",
+                "qa": false,
+                "version": "16"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-adonis"
+                }
+            ]
+        },
+        {
+            "name": "16-adonis-qa",
+            "data": {
+                "from": "kooldev/node:16-adonis",
+                "qa": true,
+                "version": "16"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-qa"
+                }
+            ]
+        },
+        {
+            "name": "16-nest",
+            "data": {
+                "from": "kooldev/node:16",
+                "qa": false,
+                "version": "16"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-nest"
+                }
+            ]
+        },
+        {
+            "name": "16-nest-qa",
+            "data": {
+                "from": "kooldev/node:16-nest",
+                "qa": true,
+                "version": "16"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-qa"
+                }
+            ]
         }
     ]
 }
diff --git a/kool.yml b/kool.yml
@@ -0,0 +1,34 @@
+scripts:
+  template: kool docker fireworkweb/fwd:v1.0 fwd template
+  build:
+    # parse templates
+    - kool run template
+    # node 10
+    - docker build --pull -t kooldev/node:10 10
+    - docker build -t kooldev/node:10-qa 10-qa
+    - docker build -t kooldev/node:10-adonis 10-adonis
+    - docker build -t kooldev/node:10-adonis-qa 10-adonis-qa
+    - docker build -t kooldev/node:10-nest 10-nest
+    - docker build -t kooldev/node:10-nest-qa 10-nest-qa
+    # node 12
+    - docker build --pull -t kooldev/node:12 12
+    - docker build -t kooldev/node:12-qa 12-qa
+    - docker build -t kooldev/node:12-adonis 12-adonis
+    - docker build -t kooldev/node:12-adonis-qa 12-adonis-qa
+    - docker build -t kooldev/node:12-nest 12-nest
+    - docker build -t kooldev/node:12-nest-qa 12-nest-qa
+    # node 14
+    - docker build --pull -t kooldev/node:14 14
+    - docker build -t kooldev/node:14-qa 14-qa
+    - docker build -t kooldev/node:14-adonis 14-adonis
+    - docker build -t kooldev/node:14-adonis-qa 14-adonis-qa
+    - docker build -t kooldev/node:14-nest 14-nest
+    - docker build -t kooldev/node:14-nest-qa 14-nest-qa
+    # node 16
+    - docker build --pull -t kooldev/node:16 16
+    - docker build -t kooldev/node:16-qa 16-qa
+    - docker build -t kooldev/node:16-adonis 16-adonis
+    - docker build -t kooldev/node:16-adonis-qa 16-adonis-qa
+    - docker build -t kooldev/node:16-nest 16-nest
+    - docker build -t kooldev/node:16-nest-qa 16-nest-qa
+
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -17,7 +17,7 @@
         libpng-dev \
         make \
         zlib-dev \
-        python \
+        {{ $version === 8 ? 'python' : 'python2' }} \
     && npm install -g pnpm \
     && rm -rf rm -rf /root/.npm/*
 
