fix(circleci): add audit, shellcheck and hadolint #447

WikiRik · 2020-11-28T00:48:24Z

With this extra bit I think I'm satisfied with the CircleCI config for a while, so I want to add this to the other modules as well after this has been merged.

@linuxbandit I added you here since I changed the Dockerfile to conform to the newest hadolint version. Please check it out to see if it is correct. If you want to do any changes to the Dockerfile to make it run quicker, please let me know and I will not merge this PR yet. I will copy these changes to the other modules as well

codecov · 2020-11-28T00:50:02Z

Codecov Report

Merging #447 (29ae752) into master (ac51bfc) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##            master      #447   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           38        38           
  Lines         1877      1877           
  Branches       342       342           
=========================================
  Hits          1877      1877

Impacted Files	Coverage Δ
lib/events.js	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3419f0...29ae752. Read the comment docs.

WikiRik · 2020-11-28T00:53:30Z

@linuxbandit in AEGEE/network#1 I already did some changes to the Dockerfile, but I haven't implemented those in this PR. So you can look at that as well for any optimalization

docker/statutory/Dockerfile

serge1peshcoff · 2020-11-29T09:40:50Z

@WikiRik apparently we also need to update the list of the required checks in order to be able to merge anything, should I do it?

WikiRik · 2020-11-29T09:42:19Z

@WikiRik apparently we also need to update the list of the required checks in order to be able to merge anything, should I do it?

We can override it for this PR, and change it after we have merged it. I want to get Fabri's opinion on the Dockerfile first for that

serge1peshcoff · 2020-11-29T22:07:27Z

docker/statutory/Dockerfile


-CMD sh /usr/app/scripts/bootstrap.sh && nodemon -e "js,json" lib/run.js
+CMD ["sh", "/usr/app/scripts/bootstrap.sh && nodemon -e 'js,json' lib/run.js"]


not sure if this'll work as there are 2 different commands

Yeah, I was afraid for that already. CMD should only do 1 command though. Maybe @linuxbandit knows more on this

best would be to have ENTRYPOINT and CMD. I have an example on a refactoring of core dockerfile, I'll show you

AEGEE/core#195

Splitting them is strange, so I've put a FIXME there so we can look into it later. See for more info; AEGEE/core#195 (comment)

.circleci/config.yml

serge1peshcoff

check out CMD comment, otherwise lgtm

WikiRik · 2020-12-11T20:26:32Z

Changes on the lock file might look big, but because we're using npm ci we don't have to worry about that. It checks that the package.json and the package-lock.json use the same dependencies

https://discuss.circleci.com/t/nvm-does-not-change-node-version-on-machine/28973/14

Does the same, but without react

This reverts commit 4ed9e20.

deep-assign is deprecated

WikiRik · 2021-02-08T12:47:14Z

@serge1peshcoff see my comment in the conversation. We'll fix the CMD later

Updating requires a rewrite of the notifications

## [1.6.3](1.6.2...1.6.3) (2021-02-08) ### Bug Fixes * **circleci:** add audit, shellcheck and hadolint ([#447](#447)) ([f0f9ad5](f0f9ad5))

serge1peshcoff · 2021-02-08T13:19:53Z

🎉 This PR is included in version 1.6.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

This reverts commit f0f9ad5.

## [1.6.4](1.6.3...1.6.4) (2021-02-08) ### Reverts * Revert "fix(circleci): add audit, shellcheck and hadolint (#447)" (#485) ([6b8e698](6b8e698)), closes [#447](#447) [#485](#485)

…)" (#485)" This reverts commit 6b8e698.

WikiRik requested review from serge1peshcoff and linuxbandit November 28, 2020 00:48

serge1peshcoff reviewed Nov 29, 2020

View reviewed changes

docker/statutory/Dockerfile Outdated Show resolved Hide resolved

serge1peshcoff reviewed Nov 29, 2020

View reviewed changes

docker/statutory/Dockerfile Outdated Show resolved Hide resolved

serge1peshcoff reviewed Nov 29, 2020

View reviewed changes

docker/statutory/Dockerfile Show resolved Hide resolved

serge1peshcoff reviewed Nov 29, 2020

View reviewed changes

WikiRik requested a review from serge1peshcoff November 29, 2020 22:08

serge1peshcoff reviewed Nov 30, 2020

View reviewed changes

.circleci/config.yml Outdated Show resolved Hide resolved

serge1peshcoff reviewed Nov 30, 2020

View reviewed changes

WikiRik marked this pull request as draft December 8, 2020 13:40

WikiRik mentioned this pull request Dec 8, 2020

feat: impr dockerfile build speed; use entrypoint AEGEE/core#195

Draft

WikiRik force-pushed the circleci-part-2 branch from 2355471 to 4ed9e20 Compare December 11, 2020 19:55

WikiRik added 13 commits February 8, 2021 12:57

chore(circleci): trying node/install again

cc154e5

chore(circleci): change statements

7f7505d

chore(circleci): different approach

ee327c2

https://discuss.circleci.com/t/nvm-does-not-change-node-version-on-machine/28973/14

chore(circleci): combining commands

f938afa

chore(circleci): change postgres version in test

f6bb6f8

chore(circleci): add password back

b0a9b5a

fix(circleci): add shellcheck and hadolint

cc942af

chore(circleci): pin Dockerfile path

1bd3610

chore(circleci): add docker auth

99116a0

fix(Dockerfile): conform to hadolint

45dfc3b

chore(circleci): remove docker auth

9ec7322

chore(circleci): test combination of linters

3a3f9dd

chore(circleci): remove old lint jobs

a1be6b4

WikiRik and others added 10 commits February 8, 2021 12:57

chore(circleci): add slack message in case of failure

c0e24a9

chore(eslint): use airbnb-base instead of airbnb

f5c032d

Does the same, but without react

chore(codecov): test with not excluding files for coverage

112946c

chore(codecov): revert test with not excluding files for coverage

2589f06

This reverts commit 4ed9e20.

chore(npm): bring lockfile back to v1

ac637d9

chore(npm): remove old bugsnag

ca54f2c

chore(audit): don't check devDeps

a72fc88

chore(deps): remove deep-assign and use lodash.merge

b01484a

deep-assign is deprecated

chore(deep-assign): fix usage in events.js

e9ad215

fix(circleci): improved Dockerfile and rebase

c3598d7

WikiRik force-pushed the circleci-part-2 branch from db8d2a6 to c3598d7 Compare February 8, 2021 12:39

chore(circleci): re-add postgres password

c44c66c

WikiRik requested a review from serge1peshcoff February 8, 2021 12:46

WikiRik marked this pull request as ready for review February 8, 2021 12:46

WikiRik added 2 commits February 8, 2021 13:54

chore(circleci): update versions

87c1432

chore(circleci): add comment about Slack orb

b8c2f42

Updating requires a rewrite of the notifications

serge1peshcoff approved these changes Feb 8, 2021

View reviewed changes

chore(circleci): downgrade docker subversion

29ae752

WikiRik merged commit f0f9ad5 into master Feb 8, 2021

WikiRik deleted the circleci-part-2 branch February 8, 2021 13:17

serge1peshcoff pushed a commit that referenced this pull request Feb 8, 2021

chore(release): 1.6.3 [skip ci]

5cc29e3

## [1.6.3](1.6.2...1.6.3) (2021-02-08) ### Bug Fixes * **circleci:** add audit, shellcheck and hadolint ([#447](#447)) ([f0f9ad5](f0f9ad5))

serge1peshcoff added the released label Feb 8, 2021

WikiRik added a commit that referenced this pull request Feb 8, 2021

Revert "fix(circleci): add audit, shellcheck and hadolint (#447)"

8ef5a35

This reverts commit f0f9ad5.

WikiRik added a commit that referenced this pull request Feb 8, 2021

Revert "fix(circleci): add audit, shellcheck and hadolint (#447)" (#485)

6b8e698

This reverts commit f0f9ad5.

WikiRik restored the circleci-part-2 branch February 8, 2021 14:00

WikiRik deleted the circleci-part-2 branch February 8, 2021 14:10

WikiRik added a commit that referenced this pull request Feb 8, 2021

Revert "Revert "fix(circleci): add audit, shellcheck and hadolint (#447…

8b342bb

…)" (#485)" This reverts commit 6b8e698.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(circleci): add audit, shellcheck and hadolint #447

fix(circleci): add audit, shellcheck and hadolint #447

WikiRik commented Nov 28, 2020

codecov bot commented Nov 28, 2020 •

edited

Loading

WikiRik commented Nov 28, 2020

serge1peshcoff commented Nov 29, 2020

WikiRik commented Nov 29, 2020

serge1peshcoff Nov 29, 2020

WikiRik Nov 29, 2020

linuxbandit Dec 2, 2020

WikiRik Dec 8, 2020

WikiRik Feb 8, 2021

serge1peshcoff left a comment

WikiRik commented Dec 11, 2020

WikiRik commented Feb 8, 2021

serge1peshcoff commented Feb 8, 2021


		CMD sh /usr/app/scripts/bootstrap.sh && nodemon -e "js,json" lib/run.js
		CMD ["sh", "/usr/app/scripts/bootstrap.sh && nodemon -e 'js,json' lib/run.js"]

fix(circleci): add audit, shellcheck and hadolint #447

fix(circleci): add audit, shellcheck and hadolint #447

Conversation

WikiRik commented Nov 28, 2020

codecov bot commented Nov 28, 2020 • edited Loading

Codecov Report

WikiRik commented Nov 28, 2020

serge1peshcoff commented Nov 29, 2020

WikiRik commented Nov 29, 2020

serge1peshcoff Nov 29, 2020

Choose a reason for hiding this comment

WikiRik Nov 29, 2020

Choose a reason for hiding this comment

linuxbandit Dec 2, 2020

Choose a reason for hiding this comment

WikiRik Dec 8, 2020

Choose a reason for hiding this comment

WikiRik Feb 8, 2021

Choose a reason for hiding this comment

serge1peshcoff left a comment

Choose a reason for hiding this comment

WikiRik commented Dec 11, 2020

WikiRik commented Feb 8, 2021

serge1peshcoff commented Feb 8, 2021

codecov bot commented Nov 28, 2020 •

edited

Loading