Skip to content

Commit 0fee308

Browse files
committed
Using v3 of Compose file structure
Use newer Docker Compose build on CircleCI
1 parent e0c9b8e commit 0fee308

File tree

4 files changed

+40
-32
lines changed

4 files changed

+40
-32
lines changed

.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ jobs:
66

77
steps:
88
- checkout
9-
9+
- run:
10+
name: Install Docker Compose
11+
command: |
12+
set -x
13+
curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
14+
chmod +x ~/docker-compose
15+
sudo mv ~/docker-compose /usr/local/bin/docker-compose
1016
- run:
1117
name: Build Apache Docker image
1218
command: |
@@ -25,7 +31,6 @@ jobs:
2531
docker ps -a
2632
sleep 10
2733
28-
2934
- run: mkdir -p ~/apache/logs/container-build
3035

3136
- run:
@@ -37,7 +42,7 @@ jobs:
3742
name: Global Environment Vars
3843
command: |
3944
docker exec apache_web_1 /bin/bash -c "export"
40-
45+
4146
- run:
4247
name: DEV Build Tests
4348
command: |

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ trim_trailing_whitespace = false
1414

1515
[*.yml]
1616
indent_style = space
17+
indent_size = 2
1718

1819
[Makefile]
1920
indent_style = tab

.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
SASL_USER=p08tf1X
22
SASL_PASS=p@ssw0Rd
33
SMTP_HOST=email-test.htmlgraphic.com
4+
VOLUMES=/Volumes/Case/SITES/docker:/data
5+
#VOLUMES=/c/Users/southpark/docker:/data

docker-compose.local.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
web:
2-
image: 'htmlgraphic/apache:envoyer'
3-
volumes:
4-
- "/Volumes/Case/SITES/docker:/data"
5-
#- "/c/Users/southpark/docker:/data"
6-
links:
7-
- "db:mysql"
8-
ports:
9-
- "80:80"
10-
- "443:443"
11-
environment:
12-
- NODE_ENVIRONMENT=dev
13-
env_file:
14-
- .env
15-
db:
16-
image: 'htmlgraphic/mysql:5.7.18'
17-
volumes_from:
18-
- db-data
19-
ports:
20-
- "3306:3306"
21-
environment:
22-
- MYSQL_ROOT_PASSWORD=new_passwordac
23-
- MYSQL_DATABASE=htmlgraphic
24-
- MYSQL_USER=admin
25-
- MYSQL_PASSWORD=new_password
26-
db-data:
27-
image: 'busybox:latest'
28-
volumes:
29-
- "/var/lib/mysql"
1+
version: "3"
2+
services:
3+
web:
4+
image: 'htmlgraphic/apache:envoyer'
5+
volumes:
6+
- "/Volumes/Case/SITES/docker:/data" # <- Change to preferred local working dir
7+
#- "/c/Users/southpark/docker:/data"
8+
links:
9+
- "db:mysql"
10+
ports:
11+
- "80:80"
12+
- "443:443"
13+
environment:
14+
- NODE_ENVIRONMENT=dev
15+
env_file:
16+
- .env
17+
db:
18+
image: 'htmlgraphic/mysql:5.7.18'
19+
volumes:
20+
- "db-data:/var/lib/mysql"
21+
ports:
22+
- "3306:3306"
23+
environment:
24+
- MYSQL_ROOT_PASSWORD=new_passwordac
25+
- MYSQL_DATABASE=htmlgraphic
26+
- MYSQL_USER=admin
27+
- MYSQL_PASSWORD=new_password
28+
volumes:
29+
db-data:

0 commit comments

Comments
 (0)