Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
8006f4f
Merge pull request #29 from koromerzhin/dependabot/npm_and_yarn/hoste…
koromerzhin Jun 1, 2021
ea367b7
Merge pull request #28 from koromerzhin/renovate/npm-hosted-git-info-…
koromerzhin Jun 1, 2021
7b91040
chore(deps): update dependency jscpd to v3.3.26
renovate-bot Jun 1, 2021
30a08d5
Merge pull request #31 from koromerzhin/renovate/jscpd-3.x
koromerzhin Jun 4, 2021
a67193c
fix(docker): add host
koromerzhin Jun 30, 2021
f118080
feat(makefile): add arguments
koromerzhin Aug 17, 2021
b613067
feat(makefile): add arguments
koromerzhin Aug 17, 2021
81dfb60
fix(makefile): correction docker init
koromerzhin Aug 17, 2021
3eeb6ed
feat(docker): update to lampy
koromerzhin Aug 19, 2021
9c076fb
fix(makefile): add color
koromerzhin Sep 1, 2021
42b6ca0
fix(makefile): add color
koromerzhin Sep 1, 2021
afc3846
fix(makefile): simplification
koromerzhin Sep 2, 2021
762f485
fix(deps): update
koromerzhin Jan 19, 2022
6cadf78
fix(deps): update
koromerzhin Jan 19, 2022
c66b218
fix(makefile): commands with arguments
koromerzhin Jan 20, 2022
a6cada5
fix(docker): launch lampy
koromerzhin Jan 20, 2022
1fe0a6e
fix(libs): update koromerzhin-dependencies
koromerzhin Feb 1, 2022
d13ecf0
Update docker-compose.yml
koromerzhin Feb 8, 2022
73ea8ac
fix(docker): use official image
koromerzhin Feb 9, 2022
15d7eeb
chore(deps): update actions/checkout action to v3
renovate-bot Mar 7, 2022
afdc72a
Merge pull request #47 from koromerzhin/renovate/actions-checkout-3.x
koromerzhin Mar 11, 2022
9fbdb49
fix(doc): to download
koromerzhin May 3, 2022
77d9002
feat(scripts): with korojscommands
koromerzhin Jan 18, 2023
4d67c61
fix(README): add help to launch
koromerzhin Jan 18, 2023
ce894d7
:busts_in_silhouette: Add @renovate-bot as a contributor
koromerzhin Jan 18, 2023
02b06f2
:busts_in_silhouette: Add @dependabot[bot] as a contributor
koromerzhin Jan 18, 2023
c6be07a
fix(config): enable dashboard renovate
koromerzhin Jan 18, 2023
c350062
fix(ci/cd): update ubuntu
koromerzhin Jan 18, 2023
7cb2a58
Add .whitesource configuration file
mend-bolt-for-github[bot] Jan 18, 2023
1b2c064
Merge pull request #64 from hackariens/whitesource/configure
koromerzhin Jan 19, 2023
2442a1f
:busts_in_silhouette: Add @mend-bolt-for-github[bot] as a contributor
koromerzhin Jan 19, 2023
bd11164
feat(ci/cd): check contributors
koromerzhin Jan 24, 2023
21534f0
fix(libs): update korojscommands
koromerzhin Jan 24, 2023
4ce8139
fix(libs): update korojscommands@1.2.11
koromerzhin Jan 24, 2023
dc389bd
fix(ci/cd): disable all-contributors
koromerzhin Jan 24, 2023
cf67ccd
fix(config): with new initialisation
koromerzhin Jan 30, 2023
07637d8
fix(libs): update korojscommands
koromerzhin Jan 30, 2023
50ba496
fix(scripts): update korojscommands
koromerzhin Feb 1, 2023
1ee0f1a
wip(ci/cd): add cypress
koromerzhin Feb 1, 2023
9343b89
wip(ci/cd): add first test
koromerzhin Feb 1, 2023
da4a1eb
wip(ci/cd): add script to cypress
koromerzhin Feb 2, 2023
db0df84
fix(ci/cd): run-ons
koromerzhin Feb 2, 2023
02e22fb
fix(ci/cd): add screenshot
koromerzhin Feb 2, 2023
a8bdccd
fix(deps): update dependency korojscommands to v1.2.19
renovate[bot] Jun 20, 2023
718a60c
Merge pull request #86 from hackariens/renovate/korojscommands-1.x-lo…
koromerzhin Jun 21, 2023
510ff8f
fix(deps): update dependency korojscommands to v1.2.20
renovate[bot] Jun 21, 2023
9f46e49
Merge pull request #90 from hackariens/renovate/korojscommands-1.x-lo…
koromerzhin Jun 21, 2023
62ac5d8
chore(deps): update actions/checkout action to v4
renovate[bot] Sep 4, 2023
e16abcd
Merge pull request #93 from hackariens/renovate/actions-checkout-4.x
koromerzhin Sep 5, 2023
baf879b
chore(config): migrate config renovate.json (#100)
renovate[bot] Dec 6, 2024
3164dad
Update ci.yml
koromerzhin Dec 10, 2024
0000936
Update cypress.config.js
koromerzhin Dec 11, 2024
bc1f7b8
Update ci.yml
koromerzhin Dec 11, 2024
94aa06b
Update ci.yml
koromerzhin Dec 12, 2024
23a9be7
Remove unused dependency and add taskfiles subproject
koromerzhin Oct 6, 2025
d98790c
refactor(package.json): remove unused docker scripts and add devDepen…
koromerzhin Oct 6, 2025
33787e6
refactor(ci.yml): simplify Cypress configuration by merging lines
koromerzhin Oct 6, 2025
a6b717d
Update ci.yml
koromerzhin Oct 7, 2025
a5b1f21
Update ci.yml
koromerzhin Oct 7, 2025
880d790
chore(deps): update actions/checkout action to v5 (#109)
renovate[bot] Oct 7, 2025
1f81b80
chore(deps): update actions/setup-node action to v5 (#110)
renovate[bot] Oct 7, 2025
7ce90ea
refactor(ci): simplify Docker Compose setup and remove unused environ…
koromerzhin Oct 8, 2025
b0a6a04
feat(tasks): add silent option to various tasks for cleaner output
koromerzhin Oct 8, 2025
28cabbe
chore(taskfiles): update subproject commit reference
koromerzhin Oct 8, 2025
6b7833b
chore(ci): remove unnecessary command to check Docker Compose version
koromerzhin Oct 8, 2025
0e47d95
chore(subproject): update lampy submodule reference to v4.1
koromerzhin Oct 8, 2025
d4349ec
chore(ci): enhance caching strategy and update dependency installatio…
koromerzhin Oct 8, 2025
416119b
chore(taskfiles): update subproject tags v1.0.0
koromerzhin Oct 9, 2025
afe979f
Update readme.md
koromerzhin Oct 10, 2025
a79c39a
chore: update dependencies
koromerzhin Oct 10, 2025
30c445b
:busts_in_silhouette: Add @renovate[bot] as a contributor
koromerzhin Oct 10, 2025
c3d11de
Update contributors + dependencies
koromerzhin Oct 10, 2025
7e31b33
chore(ci): update lampy repository reference to v4.2
koromerzhin Oct 11, 2025
08a0ee0
fix(deps): update dependency morgan to v1.10.1
renovate[bot] Oct 11, 2025
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
48 changes: 30 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,29 @@
"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"
]
},
{
"login": "renovate[bot]",
"name": "renovate[bot]",
"avatar_url": "https://avatars.githubusercontent.com/in/2740?v=4",
"profile": "https://github.com/apps/renovate",
"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
DOCKERCOMPOSEFILE=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.

117 changes: 86 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,92 @@
name: Continuous Integration
on: [push]
name: CI/CD Pipeline
on:
push:
branches: [main, develop]
pull_request:
branches: [main, develop]

jobs:
tests:
runs-on: ${{ matrix.operating-system }}
strategy:
fail-fast: false
matrix:
operating-system: [ubuntu-20.04]
ci:
runs-on: ubuntu-24.04
timeout-minutes: 60
env:
DOCKER_INTERACTIVE: false
steps:
# === SETUP PHASE ===
- name: Checkout
uses: actions/checkout@v2
- name: Cache npm packages
id: npm-cache
uses: actions/cache@v2
uses: actions/checkout@v5
with:
submodules: recursive

- name: Setup Docker Compose
uses: docker/setup-compose-action@v1

- name: Setup Task
uses: go-task/setup-task@v1

- name: Setup Node.js
uses: actions/setup-node@v5
with:
node-version-file: '.nvmrc'
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- name: Repository lampy
uses: actions/checkout@v5
with:
submodules: recursive
repository: koromerzhin/lampy
ref: '4.2'
path: lampy

- name: Setup cache
uses: actions/cache@v4
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node
- 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
- name: 'Image pull'
run: make docker image-pull
- name: 'Build containers'
run: make docker deploy
- name: 'sleep'
run: make sleep 60
- name: 'docker ls'
run: make docker ls
- name: linter readme.md
run: make linter readme
restore-keys: ${{ runner.os }}-node-

- name: Install dependencies
run: |
if [ ! -d node_modules ]; then
npm install
fi

- name: Setup environment files
run: |
cp .env.example .env

- name: Setup database and infrastructure
run: |
cd lampy && task lampy:exec

- name: Deploy containers
run: |
task expressjs:exec

- name: Run Cypress tests
uses: cypress-io/github-action@v6
continue-on-error: true
with:
wait-on-timeout: 120
browser: chrome
record: false
parallel: false
config: screenshotOnRunFailure=true,video=true,videoCompression=32,defaultCommandTimeout=10000,requestTimeout=10000,responseTimeout=10000,retries={"runMode":2,"openMode":0}
env:
CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

# === ARTIFACTS PHASE ===
- name: Archive test results
uses: actions/upload-artifact@v4
if: always()
with:
name: "test-results-${{ github.run_number }}-${{ github.sha }}"
path: |
cypress/screenshots
cypress/videos
cypress/reports
retention-days: 7
if-no-files-found: ignore
compression-level: 6
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/node_modules
/back/node_modules
/front/node_modules
app/node_modules
.env
apps/node_modules
docker-compose-*.yml
!docker-compose-lampy.yml
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "taskfiles"]
path = taskfiles
url = git@github.com:koromerzhin/taskfiles.git
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v22
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"
}
}
Loading
Loading