tweak: add to kooldev/node:18 image

wdarking · wdarking · commit bb9a5785ddc0 · 2023-08-18T11:59:57.000-03:00
diff --git a/16/Dockerfile b/16/Dockerfile
@@ -7,6 +7,7 @@ ENV ASUSER= \
 WORKDIR /app
 
 RUN adduser -D -u 1337 kool && deluser --remove-home node \
+    # deps
     && apk add --no-cache \
         bash \
         git \
@@ -18,7 +19,10 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
         make \
         zlib-dev \
     && npm install -g pnpm \
-    && rm -rf rm -rf /root/.npm/*
+    && rm -rf rm -rf /root/.npm/* \
+    # dockerize
+    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && mv dockerize /usr/local/bin/dockerize
 
 COPY root-npmrc /root/.npmrc
 COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
diff --git a/18-ci/Dockerfile b/18-ci/Dockerfile
diff --git a/18/Dockerfile b/18/Dockerfile
@@ -7,6 +7,7 @@ ENV ASUSER= \
 WORKDIR /app
 
 RUN adduser -D -u 1337 kool && deluser --remove-home node \
+    # deps
     && apk add --no-cache \
         bash \
         git \
@@ -18,7 +19,10 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
         make \
         zlib-dev \
     && npm install -g pnpm \
-    && rm -rf rm -rf /root/.npm/*
+    && rm -rf rm -rf /root/.npm/* \
+    # dockerize
+    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && mv dockerize /usr/local/bin/dockerize
 
 COPY root-npmrc /root/.npmrc
 COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
diff --git a/fwd-template.json b/fwd-template.json
@@ -50,19 +50,6 @@
                     "path": "template/root-npmrc"
                 }
             ]
-        },
-        {
-            "name": "18-ci",
-            "data": {
-                "from": "kooldev/node:18",
-                "version": "18"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile-ci"
-                }
-            ]
         }
     ]
 }
diff --git a/template/Dockerfile-ci.blade.php b/template/Dockerfile-ci.blade.php
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -7,6 +7,7 @@
 WORKDIR /app
 
 RUN adduser -D -u 1337 kool && deluser --remove-home node \
+    # deps
     && apk add --no-cache \
         bash \
         git \
@@ -18,7 +19,10 @@
         make \
         zlib-dev \
     && npm install -g pnpm \
-    && rm -rf rm -rf /root/.npm/*
+    && rm -rf rm -rf /root/.npm/* \
+    # dockerize
+    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
+    && mv dockerize /usr/local/bin/dockerize
 
 COPY root-npmrc /root/.npmrc
 COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc

Original file line number	Diff line number	Diff line change
`@@ -50,19 +50,6 @@`
`50`	`50`	`"path": "template/root-npmrc"`
`51`	`51`	`}`
`52`	`52`	`]`
`53`		`- },`
`54`		`- {`
`55`		`- "name": "18-ci",`
`56`		`- "data": {`
`57`		`- "from": "kooldev/node:18",`
`58`		`- "version": "18"`
`59`		`- },`
`60`		`- "files": [`
`61`		`- {`
`62`		`- "name": "Dockerfile",`
`63`		`- "path": "template/Dockerfile-ci"`
`64`		`- }`
`65`		`- ]`
`66`	`53`	`}`
`67`	`54`	`]`
`68`	`55`	`}`