Skip to content

Commit e8b68cc

Browse files
committed
composer format tweak
1 parent 8bac204 commit e8b68cc

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ jobs:
7171
name: Container Logs
7272
command: |
7373
mkdir -p /tmp/container-build
74-
docker logs apache_hg-web_1 > /tmp/container-build/log_output-LIVE_Apache.txt
75-
docker logs apache_hg-db_1 > /tmp/container-build/log_output-LIVE_MySQL.txt
74+
docker logs apache_web_1 > /tmp/container-build/log_output-LIVE_Apache.txt
75+
docker logs apache_db_1 > /tmp/container-build/log_output-LIVE_MySQL.txt
7676
7777
7878

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
[![Beerpay](https://beerpay.io/htmlgraphic/Apache/badge.svg?style=beer)](https://beerpay.io/htmlgraphic/Apache) [![Beerpay](https://beerpay.io/htmlgraphic/Apache/make-wish.svg?style=flat)](https://beerpay.io/htmlgraphic/Apache)
88

99

10-
This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP 7.3, PHP Composer, linked [MySQL 5.7.26](https://hub.docker.com/_/mysql) instance and a data container volume.
10+
This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP 7.3, PHP Composer, linked [MySQL 5.7.28](https://hub.docker.com/_/mysql) instance and a data container volume.
1111

12-
In this repo you will find a number of complete Dockerfile builds used in **dev** or **production** environments. Listed below is an explanation of each file. [Ask a question!](https://github.com/htmlgraphic/Apache/issues/new)
12+
Using containers offer a huge advantage when developing locally or in prodcution. Use this containers for development and deployment. Changing `NODE_ENVIRONMENT` within to `.env` to `dev` or `production` will offer a dynamic environment.
13+
14+
Listed below is an explanation of each file. [Ask a question!](https://github.com/htmlgraphic/Apache/issues/new)
1315

1416
#### Dependencies
1517
- Docker [Download](https://hub.docker.com/search/?type=edition&offering=community)

docker-compose.local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
max-size: "200k"
2020
max-file: "10"
2121
db:
22-
image: 'mysql:5.7.25'
22+
image: 'mysql:5.7.28'
2323
container_name: apache_db
2424
volumes:
2525
- 'db-data:/var/lib/mysql'

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: '3.3'
22
services:
3-
hg-web:
3+
web:
44
image: 'htmlgraphic/apache:envoyer' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
55
ports:
66
- "80:80"
@@ -11,14 +11,14 @@ services:
1111
- '/var/data:/data'
1212
- '/etc/letsencrypt:/etc/letsencrypt'
1313
links:
14-
- "hg-db:mysql"
14+
- "db:mysql"
1515
logging:
1616
driver: "json-file"
1717
options:
1818
max-size: "200k"
1919
max-file: "10"
20-
hg-db:
21-
image: 'mysql:5.7.25'
20+
db:
21+
image: 'mysql:5.7.28'
2222
environment:
2323
- MYSQL_DATABASE=htmlgraphic
2424
- MYSQL_PASSWORD=new_password

0 commit comments

Comments
 (0)