Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5c07df9
chore(deps): update dependency jscpd to v3.3.26
renovate-bot Jun 6, 2021
da28d13
Merge pull request #14 from koromerzhin/renovate/jscpd-3.x
koromerzhin Jun 7, 2021
810e960
chore(deps): update dependency markdownlint-cli to v0.27.1
renovate-bot Jun 7, 2021
0642704
fix(deps): update dependency socket.io to v4
renovate-bot Jun 7, 2021
3d0d0d2
Merge pull request #18 from koromerzhin/renovate/major-socket.io-pack…
koromerzhin Jun 7, 2021
ac5626e
Merge pull request #17 from koromerzhin/renovate/markdownlint-cli-0.x
koromerzhin Jun 7, 2021
452b79c
chore(deps): pin dependency generate-changelog to 1.8.0
renovate-bot Jun 7, 2021
144f33d
chore(deps): update dependency nodemon to v2.0.7
renovate-bot Jun 7, 2021
ec4adc6
Merge pull request #16 from koromerzhin/renovate/nodemon-2.x
koromerzhin Jun 8, 2021
f6f53ae
Merge pull request #13 from koromerzhin/renovate/pin-dependencies
koromerzhin Jun 8, 2021
3f3d2e9
fix(docker): add host
koromerzhin Jun 30, 2021
e47f409
chore(deps): update dependency nodemon to v2.0.12
renovate-bot Jul 10, 2021
1898ebb
chore(deps): update dependency markdownlint-cli to v0.28.1
renovate-bot Jul 23, 2021
127c920
feat(makefile): add arguments
koromerzhin Aug 17, 2021
a4194ad
fix(makefile): correction docker init
koromerzhin Aug 17, 2021
7da2168
feat(docker): update to lampy
koromerzhin Aug 19, 2021
3dd703d
fix(makefile): add color
koromerzhin Sep 1, 2021
b8c8746
Merge pull request #19 from koromerzhin/renovate/nodemon-2.x
koromerzhin Sep 1, 2021
685cacf
Merge pull request #20 from koromerzhin/renovate/markdownlint-cli-0.x
koromerzhin Sep 1, 2021
dabf094
fix(makefile): simplification
koromerzhin Sep 2, 2021
baacc0d
chore(deps): update dependency nodemon to v2.0.13
renovate-bot Sep 23, 2021
d010c71
Merge pull request #24 from koromerzhin/renovate/nodemon-2.x
koromerzhin Oct 1, 2021
325f8f5
chore(deps): update dependency jscpd to v3.4.2
renovate-bot Nov 6, 2021
c11e677
chore(deps): update dependency nodemon to v2.0.15
renovate-bot Nov 9, 2021
4027510
chore(deps): update dependency markdownlint-cli to v0.30.0
renovate-bot Nov 20, 2021
b954b76
Merge pull request #25 from koromerzhin/renovate/markdownlint-cli-0.x
koromerzhin Jan 12, 2022
f87499a
Merge pull request #26 from koromerzhin/renovate/nodemon-2.x
koromerzhin Jan 12, 2022
28a5f2f
Merge pull request #27 from koromerzhin/renovate/jscpd-3.x
koromerzhin Jan 12, 2022
5e38d04
fix(deps): update
koromerzhin Jan 19, 2022
4d792cb
fix(makefile): commands with arguments
koromerzhin Jan 20, 2022
6106b49
fix(docker): launch lampy
koromerzhin Jan 20, 2022
ff19569
fix(libs): update koromerzhin-dependencies
koromerzhin Feb 1, 2022
c536b98
Update docker-compose.yml
koromerzhin Feb 8, 2022
4722904
Update docker-compose.yml
koromerzhin Feb 8, 2022
17922c3
fix(docker): use official image
koromerzhin Feb 9, 2022
a9fd4b1
chore(deps): update actions/checkout action to v3
renovate-bot Mar 1, 2022
ccba79d
Merge pull request #33 from koromerzhin/renovate/actions-checkout-3.x
koromerzhin Mar 11, 2022
e862712
fix(doc): to download
koromerzhin May 3, 2022
6775e76
Merge branch 'develop' of github.com:koromerzhin/template-socketio in…
koromerzhin May 3, 2022
552858a
chore(deps): bump got and nodemon in /app
dependabot[bot] Oct 25, 2022
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
16 changes: 11 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ jobs:
operating-system: [ubuntu-20.04]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive
- name: Repository lampy
uses: actions/checkout@v3
with:
submodules: recursive
repository: koromerzhin/lampy
path: lampy
- name: Cache npm packages
id: npm-cache
uses: actions/cache@v2
Expand All @@ -21,10 +29,8 @@ jobs:
- 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: 'Launch Lampy'
run: make lampy
- name: 'Image pull'
run: make docker image-pull
- name: 'Build containers'
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "make"]
path = make
url = git@github.com:koromerzhin/make.git
147 changes: 14 additions & 133 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,146 +1,27 @@
isDocker := $(shell docker info > /dev/null 2>&1 && echo 1)

.DEFAULT_GOAL := help
include make/general/Makefile
STACK := socketio
NETWORK := proxynetwork

WWW := $(STACK)_www
WWWFULLNAME := $(WWW).1.$$(docker service ps -f 'name=$(WWW)' $(WWW) -q --no-trunc | head -n1)
include make/docker/Makefile

SUPPORTED_COMMANDS := contributors docker logs git linter update inspect ssh sleep
SUPPORTED_COMMANDS := linter
SUPPORTS_MAKE_ARGS := $(findstring $(firstword $(MAKECMDGOALS)), $(SUPPORTED_COMMANDS))
ifneq "$(SUPPORTS_MAKE_ARGS)" ""
COMMAND_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(COMMAND_ARGS):;@:)
endif

help:
@grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'

.PHONY: isdocker
isdocker: ## Docker is launch
ifeq ($(isDocker), 0)
@echo "Docker is not launch"
exit 1
endif

node_modules:
@npm install

contributors: node_modules ## Contributors
ifeq ($(COMMAND_ARGS),add)
@npm run contributors add
else ifeq ($(COMMAND_ARGS),check)
@npm run contributors check
else ifeq ($(COMMAND_ARGS),generate)
@npm run contributors generate
else
@npm run contributors
endif

.PHONY: sleep
sleep: ## sleep
@sleep $(COMMAND_ARGS)

docker: isdocker ## Scripts docker
ifeq ($(COMMAND_ARGS),create-network)
@docker network create --driver=overlay $(NETWORK)
else ifeq ($(COMMAND_ARGS),image-pull)
@more docker-compose.yml | grep image: | sed -e "s/^.*image:[[:space:]]//" | while read i; do docker pull $$i; done
else ifeq ($(COMMAND_ARGS),deploy)
@docker stack deploy -c docker-compose.yml $(STACK)
else ifeq ($(COMMAND_ARGS),ls)
@docker stack services $(STACK)
else ifeq ($(COMMAND_ARGS),stop)
@docker stack rm $(STACK)
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make docker ARGUMENT"
@echo "---"
@echo "create-network: create network"
@echo "deploy: deploy"
@echo "image-pull: Get docker image"
@echo "ls: docker service"
@echo "stop: docker stop"
endif

logs: isdocker ## Scripts logs
ifeq ($(COMMAND_ARGS),stack)
@docker service logs -f --tail 100 --raw $(STACK)
else ifeq ($(COMMAND_ARGS),www)
@docker service logs -f --tail 100 --raw $(WWWFULLNAME)
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make logs ARGUMENT"
@echo "---"
@echo "stack: logs stack"
@echo "www: WWW"
endif

git: node_modules ## Scripts GIT
ifeq ($(COMMAND_ARGS),status)
@git status
else ifeq ($(COMMAND_ARGS),check)
@make contributors check -i
@make linter all -i
@make git status -i
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make git ARGUMENT"
@echo "---"
@echo "check: CHECK before"
@echo "status: status"
COMMANDS_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(COMMANDS_ARGS):;@:)
endif

install: node_modules ## Installation
@make docker deploy -i

linter: node_modules ## Scripts Linter
ifeq ($(COMMAND_ARGS),all)
.PHONY: linter
linter: node_modules ### Scripts Linter
ifeq ($(COMMANDS_ARGS),all)
@make linter readme -i
else ifeq ($(COMMAND_ARGS),readme)
else ifeq ($(COMMANDS_ARGS),readme)
@npm run linter-markdown README.md
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make linter ARGUMENT"
@echo "---"
@echo "all: ## Launch all linter"
@echo "readme: linter README.md"
endif

ssh: isdocker ## ssh
ifeq ($(COMMAND_ARGS),www)
@docker exec -it $(WWWFULLNAME) /bin/bash
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make ssh ARGUMENT"
@echo "---"
@echo "www: WWW"
endif

inspect: isdocker ## inspect
ifeq ($(COMMAND_ARGS),www)
@docker service inspect $(WWW)
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make inspect ARGUMENT"
@echo "---"
@echo "www: WWW"
endif

update: isdocker ## ssh
ifeq ($(COMMAND_ARGS),www)
@docker service update $(WWW)
else
@echo "ARGUMENT missing"
@echo "---"
@echo "make update ARGUMENT"
@echo "---"
@echo "www: WWW"
@printf "${MISSING_ARGUMENTS}" "linter"
$(call array_arguments, \
["all"]="Launch all linter" \
["readme"]="linter README.md" \
)
endif
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Software:
- make
- npm
- docker
- repository koromerzhin/traefikproxy
- repository koromerzhin/lampy

Config:

Expand All @@ -30,6 +30,14 @@ Hosts:

- socketio.traefik.me

## Download

```sh
git clone git@github.com:koromerzhin/template-socketio.git template-socketio
cd template-socketio
git submodule update --init
```

## Install

```sh
Expand Down
Loading