Skip to content

Commit d07cf5e

Browse files
fabriciojsfabriciojs
committed
drop -full + add v18
1 parent 8926352 commit d07cf5e

9 files changed

Lines changed: 13 additions & 94 deletions

File tree

‎.github/workflows/ci-cd.yml‎

Lines changed: 7 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: [10, 12, 14, 16]
10+
version: [16, 18]
1111

1212
steps:
1313
- name: Checkout code
@@ -31,64 +31,16 @@ jobs:
3131
--output type=docker \
3232
--tag kooldev/node:${{ matrix.version }} \
3333
${{ matrix.version }}
34-
docker buildx build \
35-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-qa \
36-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-qa \
37-
--output type=docker \
38-
--tag kooldev/node:${{ matrix.version }}-qa \
39-
${{ matrix.version }}-qa
40-
41-
- name: Build (adonis)
42-
run: |
43-
docker buildx build \
44-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-adonis \
45-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-adonis \
46-
--output type=docker \
47-
--tag kooldev/node:${{ matrix.version }}-adonis \
48-
${{ matrix.version }}-adonis
49-
docker buildx build \
50-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-adonis-qa \
51-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-adonis-qa \
52-
--output type=docker \
53-
--tag kooldev/node:${{ matrix.version }}-adonis-qa \
54-
${{ matrix.version }}-adonis-qa
55-
56-
- name: Build (nest)
57-
run: |
58-
docker buildx build \
59-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nest \
60-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nest \
61-
--output type=docker \
62-
--tag kooldev/node:${{ matrix.version }}-nest \
63-
${{ matrix.version }}-nest
64-
docker buildx build \
65-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nest-qa \
66-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nest-qa \
67-
--output type=docker \
68-
--tag kooldev/node:${{ matrix.version }}-nest-qa \
69-
${{ matrix.version }}-nest-qa
70-
71-
- name: Build (latest)
72-
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
73-
run: |
74-
docker tag kooldev/node:${{ matrix.version }}-qa kooldev/node:qa
75-
docker tag kooldev/node:${{ matrix.version }} kooldev/node:latest
76-
docker tag kooldev/node:${{ matrix.version }}-adonis kooldev/node:adonis
77-
docker tag kooldev/node:${{ matrix.version }}-adonis-qa kooldev/node:adonis-qa
78-
docker tag kooldev/node:${{ matrix.version }}-nest kooldev/node:nest
79-
docker tag kooldev/node:${{ matrix.version }}-nest-qa kooldev/node:nest-qa
8034
8135
- name: Tests
8236
run: |
83-
for suffix in '' -adonis -nest; do
84-
docker run kooldev/node:${{ matrix.version }}$suffix node -v;
85-
docker run kooldev/node:${{ matrix.version }}$suffix npm -v;
86-
docker run kooldev/node:${{ matrix.version }}$suffix yarn -v;
37+
docker run kooldev/node:${{ matrix.version }} node -v;
38+
docker run kooldev/node:${{ matrix.version }} npm -v;
39+
docker run kooldev/node:${{ matrix.version }} yarn -v;
8740
88-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix node -v;
89-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix npm -v;
90-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix yarn -v;
91-
done
41+
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} node -v;
42+
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} npm -v;
43+
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} yarn -v;
9244
9345
- name: Login to DockerHub
9446
uses: docker/login-action@v1.12.0
@@ -101,18 +53,3 @@ jobs:
10153
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node'
10254
run: |
10355
docker push kooldev/node:${{ matrix.version }}
104-
docker push kooldev/node:${{ matrix.version }}-qa
105-
docker push kooldev/node:${{ matrix.version }}-adonis
106-
docker push kooldev/node:${{ matrix.version }}-adonis-qa
107-
docker push kooldev/node:${{ matrix.version }}-nest
108-
docker push kooldev/node:${{ matrix.version }}-nest-qa
109-
110-
- name: Push to DockerHub (latest)
111-
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
112-
run: |
113-
docker push kooldev/node:qa
114-
docker push kooldev/node:latest
115-
docker push kooldev/node:adonis
116-
docker push kooldev/node:adonis-qa
117-
docker push kooldev/node:nest
118-
docker push kooldev/node:nest-qa

‎16/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
2020
&& npm install -g pnpm \
2121
&& rm -rf rm -rf /root/.npm/*
2222

23-
2423
COPY root-npmrc /root/.npmrc
2524
COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
2625
COPY entrypoint /entrypoint

16-full/Dockerfile renamed to 18/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16-alpine
1+
FROM node:18-alpine
22

33
ENV ASUSER= \
44
UID=0 \
@@ -20,13 +20,6 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
2020
&& npm install -g pnpm \
2121
&& rm -rf rm -rf /root/.npm/*
2222

23-
RUN npm install -g buddy.js jshint jsinspect eslint \
24-
# for NestJS
25-
@nestjs/cli \
26-
# for AdonisJS
27-
@adonisjs/cli \
28-
&& rm -rf rm -rf /root/.npm/*
29-
3023
COPY root-npmrc /root/.npmrc
3124
COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
3225
COPY entrypoint /entrypoint

16-full/entrypoint renamed to 18/entrypoint

File renamed without changes.

16-full/kool-npmrc renamed to 18/kool-npmrc

File renamed without changes.

16-full/root-npmrc renamed to 18/root-npmrc

File renamed without changes.

‎fwd-template.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"name": "16",
66
"data": {
77
"from": "node:16-alpine",
8-
"full": false,
98
"version": "16"
109
},
1110
"files": [
@@ -28,11 +27,10 @@
2827
]
2928
},
3029
{
31-
"name": "16-full",
30+
"name": "18",
3231
"data": {
33-
"from": "node:16-alpine",
34-
"full": true,
35-
"version": "16"
32+
"from": "node:18-alpine",
33+
"version": "18"
3634
},
3735
"files": [
3836
{

‎kool.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ scripts:
55
- kool run template
66
# node 16
77
- docker build --pull -t kooldev/node:16 16
8-
- docker build -t kooldev/node:16-full 16-full
8+
# node 18
9+
- docker build --pull -t kooldev/node:18 18

‎template/Dockerfile.blade.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@
2020
&& npm install -g pnpm \
2121
&& rm -rf rm -rf /root/.npm/*
2222

23-
@if($full)
24-
RUN npm install -g buddy.js jshint jsinspect eslint \
25-
# for NestJS
26-
@nestjs/cli \
27-
# for AdonisJS
28-
@adonisjs/cli \
29-
&& rm -rf rm -rf /root/.npm/*
30-
@endif
31-
3223
COPY root-npmrc /root/.npmrc
3324
COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
3425
COPY entrypoint /entrypoint

0 commit comments

Comments
 (0)