Skip to content

Commit 8111604

Browse files
committed
lint pass
1 parent 94d6877 commit 8111604

File tree

2 files changed

+74
-70
lines changed

2 files changed

+74
-70
lines changed

docker-compose.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
version: '3'
1+
version: "3"
22
services:
3-
crowdsec:
4-
image: crowdsecurity/crowdsec:latest
5-
environment:
6-
- DISABLE_AGENT=true
7-
volumes:
8-
- ./var/docker-data:/var/lib/crowdsec/data
9-
ports:
10-
- 8085:8080
11-
app-php8.0:
12-
build:
13-
context: .
14-
dockerfile: ./docker/php-8.0.Dockerfile
15-
env_file: ./docker/.env
16-
volumes:
17-
- .:/app
18-
links:
19-
- crowdsec
20-
- redis
21-
- memcached
22-
app-php7.4:
23-
build:
24-
context: .
25-
dockerfile: ./docker/php-7.4.Dockerfile
26-
env_file: ./docker/.env
27-
volumes:
28-
- .:/app
29-
links:
30-
- crowdsec
31-
- redis
32-
- memcached
33-
app-php7.3:
34-
build:
35-
context: .
36-
dockerfile: ./docker/php-7.3.Dockerfile
37-
env_file: ./docker/.env
38-
volumes:
39-
- .:/app
40-
links:
41-
- crowdsec
42-
- redis
43-
- memcached
44-
app:
45-
build:
46-
context: .
47-
dockerfile: ./docker/php-7.2.Dockerfile
48-
env_file: ./docker/.env
49-
volumes:
50-
- .:/app
51-
links:
52-
- crowdsec
53-
- redis
54-
- memcached
55-
redis:
56-
image: redis:6-alpine
57-
memcached:
58-
image: memcached:1-alpine
59-
curl:
60-
image: curlimages/curl
3+
crowdsec:
4+
image: crowdsecurity/crowdsec:latest
5+
environment:
6+
- DISABLE_AGENT=true
7+
volumes:
8+
- ./var/docker-data:/var/lib/crowdsec/data
9+
ports:
10+
- 8085:8080
11+
app-php8.0:
12+
build:
13+
context: .
14+
dockerfile: ./docker/php-8.0.Dockerfile
15+
env_file: ./docker/.env
16+
volumes:
17+
- .:/app
18+
links:
19+
- crowdsec
20+
- redis
21+
- memcached
22+
app-php7.4:
23+
build:
24+
context: .
25+
dockerfile: ./docker/php-7.4.Dockerfile
26+
env_file: ./docker/.env
27+
volumes:
28+
- .:/app
29+
links:
30+
- crowdsec
31+
- redis
32+
- memcached
33+
app-php7.3:
34+
build:
35+
context: .
36+
dockerfile: ./docker/php-7.3.Dockerfile
37+
env_file: ./docker/.env
38+
volumes:
39+
- .:/app
40+
links:
41+
- crowdsec
42+
- redis
43+
- memcached
44+
app:
45+
build:
46+
context: .
47+
dockerfile: ./docker/php-7.2.Dockerfile
48+
env_file: ./docker/.env
49+
volumes:
50+
- .:/app
51+
links:
52+
- crowdsec
53+
- redis
54+
- memcached
55+
redis:
56+
image: redis:6-alpine
57+
memcached:
58+
image: memcached:1-alpine
59+
curl:
60+
image: curlimages/curl

docs/contribute.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
Here is the development environment for this library:
44

5-
- Docker dev environment (Dockerized Crowdsec, Redis, Memcached, PHP)
6-
- Continuous Integration (CI, includes Integration Tests and Super Linter)
7-
- Integration tests (with TDD)
8-
- Documented (Static documentation, PHP Doc)
5+
- Docker dev environment (Dockerized Crowdsec, Redis, Memcached, PHP)
6+
- Continuous Integration (CI, includes Integration Tests and Super Linter)
7+
- Integration tests (with TDD)
8+
- Documented (Static documentation, PHP Doc)
99

1010
## The guidelines
1111

12-
- We use TDD to code the library, with PHP Unit
13-
- CI via Github actions: run all tests over each PHP versions
14-
- Git workflow: [Github Flow](https://guides.github.com/introduction/flow/)
15-
- PHP Source fully documented
16-
- Versioning system: Semver
17-
- Code coverage (not now)
18-
- Coding standards using [php-cs-fixer](https://cs.symfony.com/) configuration in **.php_cs**
12+
- We use TDD to code the library, with PHP Unit
13+
- CI via Github actions: run all tests over each PHP versions
14+
- Git workflow: [Github Flow](https://guides.github.com/introduction/flow/)
15+
- PHP Source fully documented
16+
- Versioning system: Semver
17+
- Code coverage (not now)
18+
- Coding standards using [php-cs-fixer](https://cs.symfony.com/) configuration in **.php_cs**
1919

2020
## Run tests
2121

@@ -24,7 +24,9 @@ First of all, install composer dependencies:
2424
```bash
2525
docker-compose run app composer install
2626
```
27+
2728
Then run tests:
29+
2830
```bash
2931
./tests-local.sh # This will test with PHP 7.2 version
3032
```
@@ -36,6 +38,7 @@ Alternatively, you can tests with various php versions:
3638
./tests-local-php7.4.sh
3739
./tests-local-php8.0.sh
3840
```
41+
3942
## How to lint the code
4043

4144
You can run "Super linter" locally:
@@ -92,3 +95,4 @@ git checkout main && git pull && git co -
9295
git describe --tags `git rev-list --tags --max-count=1` # to verify what is the current tag
9396
export NEW_GIT_VERSION=v #...X.X.X
9497
./scripts/publish-release.sh
98+
```

0 commit comments

Comments
 (0)