Skip to content

Commit 7f05785

Browse files
fabriciojsfabriciojs
authored
Merge pull request #18 from kool-dev/add_node_16
Adding Node 16 + Tweak alpine upgrade for python2
2 parents 9e8c144 + 2f0929e commit 7f05785

17 files changed

Lines changed: 282 additions & 47 deletions

File tree

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

Lines changed: 59 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: [10, 12, 14]
11-
type: ['', '-qa']
10+
version: [10, 12, 14, 16]
1211

1312
steps:
1413
- name: Checkout code
@@ -21,58 +20,74 @@ jobs:
2120
uses: actions/cache@v2.1.7
2221
with:
2322
path: /tmp/.buildx-cache
24-
key: docker-buildx-${{ matrix.version }}${{ matrix.type }}-${{ github.sha }}
25-
restore-keys: docker-buildx-${{ matrix.version }}${{ matrix.type }}-
23+
key: docker-buildx-${{ matrix.version }}-${{ github.sha }}
24+
restore-keys: docker-buildx-${{ matrix.version }}-
2625

2726
- name: Build
2827
run: |
2928
docker buildx build \
30-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
31-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
29+
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }} \
30+
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }} \
3231
--output type=docker \
33-
--tag kooldev/node:${{ matrix.version }}${{ matrix.type }} \
34-
${{ matrix.version }}${{ matrix.type }}
32+
--tag kooldev/node:${{ matrix.version }} \
33+
${{ 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
3540
3641
- name: Build (adonis)
3742
run: |
3843
docker buildx build \
39-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-adonis${{ matrix.type }} \
40-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-adonis${{ matrix.type }} \
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 \
4152
--output type=docker \
42-
--tag kooldev/node:${{ matrix.version }}-adonis${{ matrix.type }} \
43-
${{ matrix.version }}-adonis${{ matrix.type }}
53+
--tag kooldev/node:${{ matrix.version }}-adonis-qa \
54+
${{ matrix.version }}-adonis-qa
4455
4556
- name: Build (nest)
4657
run: |
4758
docker buildx build \
48-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nest${{ matrix.type }} \
49-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nest${{ matrix.type }} \
59+
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nest \
60+
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nest \
5061
--output type=docker \
51-
--tag kooldev/node:${{ matrix.version }}-nest${{ matrix.type }} \
52-
${{ matrix.version }}-nest${{ matrix.type }}
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
5370
5471
- name: Build (latest)
55-
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '14'
72+
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
5673
run: |
57-
if [ "${{ matrix.type }}" == "-qa" ]; then
58-
docker tag kooldev/node:${{ matrix.version }}-qa kooldev/node:qa
59-
else
60-
docker tag kooldev/node:${{ matrix.version }} kooldev/node:latest
61-
fi
62-
63-
docker tag kooldev/node:${{ matrix.version }}-adonis${{ matrix.type }} kooldev/node:adonis${{ matrix.type }}
64-
docker tag kooldev/node:${{ matrix.version }}-nest${{ matrix.type }} kooldev/node:nest${{ matrix.type }}
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
6580
6681
- name: Tests
6782
run: |
6883
for suffix in '' -adonis -nest; do
69-
docker run kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} node -v;
70-
docker run kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} npm -v;
71-
docker run kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} yarn -v;
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;
7287
73-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} node -v;
74-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} npm -v;
75-
docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}$suffix${{ matrix.type }} yarn -v;
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;
7691
done
7792
7893
- name: Login to DockerHub
@@ -85,18 +100,19 @@ jobs:
85100
- name: Push to DockerHub
86101
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node'
87102
run: |
88-
docker push kooldev/node:${{ matrix.version }}${{ matrix.type }}
89-
docker push kooldev/node:${{ matrix.version }}-adonis${{ matrix.type }}
90-
docker push kooldev/node:${{ matrix.version }}-nest${{ matrix.type }}
103+
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
91109
92110
- name: Push to DockerHub (latest)
93-
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '14'
111+
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' && matrix.version == '16'
94112
run: |
95-
if [ "${{ matrix.type }}" == "-qa" ]; then
96-
docker push kooldev/node:qa
97-
else
98-
docker push kooldev/node:latest
99-
fi
100-
101-
docker push kooldev/node:adonis${{ matrix.type }}
102-
docker push kooldev/node:nest${{ matrix.type }}
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

‎10/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
1717
libpng-dev \
1818
make \
1919
zlib-dev \
20-
python \
20+
python2 \
2121
&& npm install -g pnpm \
2222
&& rm -rf rm -rf /root/.npm/*
2323

‎12/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
1717
libpng-dev \
1818
make \
1919
zlib-dev \
20-
python \
20+
python2 \
2121
&& npm install -g pnpm \
2222
&& rm -rf rm -rf /root/.npm/*
2323

‎14/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN adduser -D -u 1337 kool && deluser --remove-home node \
1717
libpng-dev \
1818
make \
1919
zlib-dev \
20-
python \
20+
python2 \
2121
&& npm install -g pnpm \
2222
&& rm -rf rm -rf /root/.npm/*
2323

‎16-adonis-qa/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM kooldev/node:16-adonis
2+
3+
RUN npm install -g buddy.js jshint jsinspect eslint \
4+
&& rm -rf rm -rf /root/.npm/*

‎16-adonis/Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM kooldev/node:16
2+
3+
RUN npm install -g @adonisjs/cli \
4+
&& rm -rf rm -rf /root/.npm/*
5+
6+
CMD [ "npm", "run", "start" ]

‎16-nest-qa/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM kooldev/node:16-nest
2+
3+
RUN npm install -g buddy.js jshint jsinspect eslint \
4+
&& rm -rf rm -rf /root/.npm/*

‎16-nest/Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM kooldev/node:16
2+
3+
RUN npm install -g @nestjs/cli \
4+
&& rm -rf rm -rf /root/.npm/*
5+
6+
CMD [ "npm", "run", "start" ]

‎16-qa/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM kooldev/node:16
2+
3+
RUN npm install -g buddy.js jshint jsinspect eslint \
4+
&& rm -rf rm -rf /root/.npm/*

‎16/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM node:16-alpine
2+
3+
ENV ASUSER= \
4+
UID=0 \
5+
ENTRYPOINT=entrypoint.node.sh
6+
7+
WORKDIR /app
8+
9+
RUN adduser -D -u 1337 kool && deluser --remove-home node \
10+
&& apk add --no-cache \
11+
bash \
12+
git \
13+
shadow \
14+
su-exec \
15+
# build tools
16+
g++ \
17+
libpng-dev \
18+
make \
19+
zlib-dev \
20+
python2 \
21+
&& npm install -g pnpm \
22+
&& rm -rf rm -rf /root/.npm/*
23+
24+
COPY root-npmrc /root/.npmrc
25+
COPY --chown=kool:kool kool-npmrc /home/kool/.npmrc
26+
COPY entrypoint /entrypoint
27+
28+
RUN chmod +x /entrypoint
29+
30+
ENTRYPOINT [ "/entrypoint" ]

0 commit comments

Comments
 (0)