Skip to content

Commit e14ecfa

Browse files
committed
fix woflictl linting
Signed-off-by: Josh Wolf <josh@wolfs.io>
1 parent e846d41 commit e14ecfa

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

ingress-nginx-controller.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#nolint:valid-pipeline-fetch-digest
12
package:
23
name: ingress-nginx-controller
34
version: 1.8.0
@@ -16,6 +17,7 @@ environment:
1617
- go
1718
- bash
1819
- curl
20+
- curl-dev
1921
- git
2022
- openssh-client
2123
- libcap-utils
@@ -30,7 +32,6 @@ environment:
3032
- libxslt-dev
3133
- pkgconf
3234
- zeromq-dev
33-
- bash
3435
- gcc
3536
- clang-15
3637
- make
@@ -39,24 +40,19 @@ environment:
3940
- pcre-dev
4041
- zlib-dev
4142
- linux-headers
42-
- libcap
4343
- perl-dev
4444
- libedit-dev
4545
- mercurial
4646
- findutils
47-
- curl
4847
- ca-certificates
4948
- patch
5049
- libaio-dev
5150
- openssl
52-
- libcap-utils
5351
- cmake
5452
- util-linux
5553
- lmdb-tools
5654
- wget
57-
- curl-dev
5855
- libprotobuf
59-
- git
6056
- flex
6157
- bison
6258
- doxygen
@@ -301,7 +297,7 @@ pipeline:
301297
--disable-doxygen-html \
302298
--disable-examples
303299
304-
make
300+
make -j$(nproc)
305301
make install
306302
307303
mkdir -p ${{targets.destdir}}/etc/nginx/modsecurity
@@ -464,7 +460,7 @@ pipeline:
464460
echo "::::::::::::::::::::::::::::::::::::::::::::::"
465461
echo ":::: MAKE nginx-${{vars.NGINX_VERSION }} ::::"
466462
echo "::::::::::::::::::::::::::::::::::::::::::::"
467-
make
463+
make -j$(nproc)
468464
469465
echo ":::::::::::::::::::::::::::::::::::::::::::::::::"
470466
echo ":::: MODULES nginx-${{vars.NGINX_VERSION }} ::::"
@@ -476,19 +472,19 @@ pipeline:
476472
echo "::::::::::::::::::::::::::::::::::::::::::::::"
477473
make DESTDIR="${{targets.destdir}}" install
478474
479-
echo "::::::::::::::::::::::::::::::::::::::::::"
480-
echo ":::: SETCAP NGINX ::::"
481-
echo "::::::::::::::::::::::::::::::::::::::::::"
475+
echo "::::::::::::::::::::::::::::::::::::::::::"
476+
echo ":::: SETCAP NGINX ::::"
477+
echo "::::::::::::::::::::::::::::::::::::::::::"
482478
483479
setcap cap_net_bind_service=+ep ${{targets.destdir}}/usr/local/nginx/sbin/nginx \
484-
&& setcap -v cap_net_bind_service=+ep ${{targets.destdir}}/usr/local/nginx/sbin/nginx
480+
&& setcap -v cap_net_bind_service=+ep ${{targets.destdir}}/usr/local/nginx/sbin/nginx
485481
486482
echo "::::::::::::::::::::::::::::::::::::::::::"
487483
echo ":::: SETCAP DUMB INIT ::::"
488484
echo "::::::::::::::::::::::::::::::::::::::::::"
489485
490486
setcap cap_net_bind_service=+ep /usr/bin/dumb-init \
491-
&& setcap -v cap_net_bind_service=+ep /usr/bin/dumb-init \
487+
&& setcap -v cap_net_bind_service=+ep /usr/bin/dumb-init
492488
493489
494490
echo "::::::::::::::::::::::::::::::::::::::::::::"

0 commit comments

Comments
 (0)