Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
fb58e3e
chore(deps): update dependency hosted-git-info to 2.8.9 [security]
renovate-bot May 9, 2021
1a0c3a0
chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9
dependabot[bot] May 11, 2021
1c4e175
Merge pull request #29 from koromerzhin/dependabot/npm_and_yarn/hoste…
koromerzhin Jun 1, 2021
2dc10d8
Merge pull request #28 from koromerzhin/renovate/npm-hosted-git-info-…
koromerzhin Jun 1, 2021
bbe3999
chore(deps): update dependency jscpd to v3.3.26
renovate-bot Jun 1, 2021
e514b56
Merge pull request #31 from koromerzhin/renovate/jscpd-3.x
koromerzhin Jun 4, 2021
0d58dc1
fix(docker): add host
koromerzhin Jun 30, 2021
0e16545
feat(makefile): add arguments
koromerzhin Aug 17, 2021
e6f9a4d
feat(makefile): add arguments
koromerzhin Aug 17, 2021
44b0ba7
fix(makefile): correction docker init
koromerzhin Aug 17, 2021
7c19c98
feat(docker): update to lampy
koromerzhin Aug 19, 2021
b87b957
fix(makefile): add color
koromerzhin Sep 1, 2021
bb32fa0
fix(makefile): add color
koromerzhin Sep 1, 2021
bd52d28
fix(makefile): simplification
koromerzhin Sep 2, 2021
30bff14
fix(deps): update
koromerzhin Jan 19, 2022
11b128e
fix(deps): update
koromerzhin Jan 19, 2022
05f7ae6
fix(makefile): commands with arguments
koromerzhin Jan 20, 2022
7de9748
fix(docker): launch lampy
koromerzhin Jan 20, 2022
f22287f
fix(libs): update koromerzhin-dependencies
koromerzhin Feb 1, 2022
be73321
Update docker-compose.yml
koromerzhin Feb 8, 2022
48e9b38
fix(docker): use official image
koromerzhin Feb 9, 2022
ba53732
chore(deps): update actions/checkout action to v3
renovate-bot Mar 7, 2022
5e7d624
Merge pull request #47 from koromerzhin/renovate/actions-checkout-3.x
koromerzhin Mar 11, 2022
f4a45ed
fix(doc): to download
koromerzhin May 3, 2022
af9408e
feat(scripts): with korojscommands
koromerzhin Jan 18, 2023
866bd9e
fix(README): add help to launch
koromerzhin Jan 18, 2023
7d48ad9
:busts_in_silhouette: Add @renovate-bot as a contributor
koromerzhin Jan 18, 2023
67a903c
:busts_in_silhouette: Add @dependabot[bot] as a contributor
koromerzhin Jan 18, 2023
1d15aa9
fix(config): enable dashboard renovate
koromerzhin Jan 18, 2023
01c036a
fix(ci/cd): update ubuntu
koromerzhin Jan 18, 2023
3d5e906
Add .whitesource configuration file
mend-bolt-for-github[bot] Jan 18, 2023
67e0064
Merge pull request #64 from hackariens/whitesource/configure
koromerzhin Jan 19, 2023
82801f4
:busts_in_silhouette: Add @mend-bolt-for-github[bot] as a contributor
koromerzhin Jan 19, 2023
7dbb3eb
feat(ci/cd): check contributors
koromerzhin Jan 24, 2023
e63fcb7
fix(libs): update korojscommands
koromerzhin Jan 24, 2023
090e8f9
fix(libs): update korojscommands@1.2.11
koromerzhin Jan 24, 2023
7d0020d
fix(ci/cd): disable all-contributors
koromerzhin Jan 24, 2023
4e50de1
fix(config): with new initialisation
koromerzhin Jan 30, 2023
3783257
chore(deps): bump minimatch from 3.0.4 to 3.1.2 in /apps
dependabot[bot] Jan 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "template-expressjs",
"projectOwner": "koromerzhin",
"projectName": "expressjs",
"projectOwner": "hackariens",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand All @@ -10,7 +10,7 @@
"commit": true,
"contributorsPerLine": 7,
"commitConvention": "gitmoji",
"badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat-square)](#-contributors)",
"badgeTemplate": "![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat-square)",
"contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" width=\"<%= options.imageSize %>px;\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
"contributors": [
{
Expand All @@ -24,18 +24,13 @@
},
{
"login": "renovate-bot",
"name": "Renovate Bot",
"avatar_url": "https://avatars0.githubusercontent.com/u/25180681?v=4",
"profile": "https://renovatebot.com",
"name": "Mend Renovate",
"avatar_url": "https://avatars.githubusercontent.com/u/25180681?v=4",
"profile": "https://www.mend.io/free-developer-tools/renovate/",
"contributions": [
"bug",
"code",
"infra",
"maintenance",
"platform",
"review",
"security",
"tool"
"maintenance"
]
},
{
Expand All @@ -46,12 +41,18 @@
"contributions": [
"bug",
"code",
"infra",
"maintenance",
"platform",
"review",
"security",
"tool"
"maintenance"
]
},
{
"login": "mend-bolt-for-github[bot]",
"name": "mend-bolt-for-github[bot]",
"avatar_url": "https://avatars.githubusercontent.com/in/16809?v=4",
"profile": "https://github.com/apps/mend-bolt-for-github",
"contributions": [
"bug",
"code",
"maintenance"
]
}
]
Expand Down
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
STACK=expressjs
FOLDERPHAR=apps
FOLDERLAMPY=lampy
DOCKERCOMPOSEFILES=docker-compose.yml docker-compose-lampy.yml
76 changes: 0 additions & 76 deletions .github/CODE_OF_CONDUCT.md

This file was deleted.

38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/custom.md

This file was deleted.

20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

44 changes: 21 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
name: Continuous Integration
name: ci
on: [push]
jobs:
tests:
runs-on: ${{ matrix.operating-system }}
strategy:
fail-fast: false
matrix:
operating-system: [ubuntu-20.04]
operating-system: [ubuntu-22.04]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Cache npm packages
id: npm-cache
uses: actions/cache@v2
uses: actions/checkout@v3
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node
submodules: recursive
- name: Repository lampy
uses: actions/checkout@v3
with:
submodules: recursive
ref: 'v2.0'
repository: koromerzhin/lampy
path: lampy
- name: Install npm dependencies
if: steps.npm-cache.outputs.cache-hit != 'true'
run: make node_modules
- name: 'Docker swarm init'
run: docker swarm init --default-addr-pool 10.20.0.0/16
- name: 'Create proxy network'
run: make docker create-network
run: npm install
- name: 'set .env'
run: 'cp .env.example .env'
- name: 'Launch Lampy'
run: cd lampy && npm run exec
- name: 'Image pull'
run: make docker image-pull
run: npm run docker:getpull-image
- name: 'Build containers'
run: make docker deploy
- name: 'sleep'
run: make sleep 60
- name: 'docker ls'
run: make docker ls
run: npm run docker:deploy
- name: 'Waiting'
run: npm run docker:waiting
- name: linter readme.md
run: make linter readme
run: npm run lint:markdown
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
/node_modules
/back/node_modules
/front/node_modules
app/node_modules
.env
14 changes: 14 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"scanSettings": {
"baseBranches": []
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff",
"useMendCheckNames": true
},
"issueSettings": {
"minSeverityLevel": "LOW",
"issueType": "DEPENDENCY"
}
}
52 changes: 0 additions & 52 deletions CHANGELOG.md

This file was deleted.

39 changes: 0 additions & 39 deletions CONTRIBUTING.md

This file was deleted.

Loading