Skip to content

Commit 261d5e3

Browse files
committed
upgrade circleci to V2
1 parent f14e853 commit 261d5e3

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

.circleci/config.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: /dockerapp
5+
docker:
6+
- image: docker:17.05.0-ce-git
7+
steps:
8+
- checkout
9+
- setup_remote_docker
10+
- run:
11+
name: Install dependencies
12+
command: |
13+
apk add --no-cache py-pip=9.0.0-r1
14+
pip install docker-compose==1.15.0
15+
- run:
16+
name: Run tests
17+
command: |
18+
docker-compose up -d
19+
docker-compose run dockerapp python test.py

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ define container netwokr with docker-compose
153153
> docker-compose up -d
154154
> docker network ls (dockerapp0.4 app run on dockerapp04_my_net)
155155
```
156-
![alt text](https://github.com/smalltide/docker-tutorial-devops/blob/master/docker-compose-example.png "docker-compose-example")
156+
![alt text](https://github.com/smalltide/docker-tutorial-devops/blob/master/img/docker-compose-example.png "docker-compose-example")
157157

158158
Write and Run Unit Tests inside Containers
159159
```

circle.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

docker-compose.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
version: "2"
1+
version: "3.0"
22
services:
33
dockerapp:
44
build: .
55
ports:
66
- "5000:5000"
7-
volumes:
8-
- ./app:/app
9-
7+
depends_on:
8+
- redis
109
redis:
1110
image: redis:3.2.0
File renamed without changes.

0 commit comments

Comments
 (0)