Skip to content

Commit

Permalink
⚰️ Corrigindo docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
ricardoapaes committed Sep 11, 2024
1 parent b1c1735 commit 4487674
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 29 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/docker-publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ jobs:
docker ps -a
docker logs app
- name: Add Config PHP Version
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker compose -f docker-compose.yml \
-f docker-compose-${PHP_VERSION}.yml \
exec app add-new-config php version ${PHP_VERSION}
- name: Test -> Http Request
env:
PHP_VERSION: ${{ matrix.PHP }}
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ jobs:
docker ps -a
docker logs app
- name: Add Config PHP Version
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker compose -f docker-compose.yml \
-f docker-compose-${PHP_VERSION}.yml \
exec app add-new-config php version ${PHP_VERSION}
- name: Test -> Http request
env:
PHP_VERSION: ${{ matrix.PHP }}
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-56.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

nginx:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-73.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

nginx:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-74.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

nginx:
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-80.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '3.5'

services:

app:
command: app create && add-new-config php version 8.0
environment:
- DB_HOST_SLAVE=mysql_slave
- MEMCACHE_HOST=memcache
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-81.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '3.5'

services:

app:
command: app create && add-new-config php version 8.1
environment:
- DB_HOST_SLAVE=mysql_slave
- MEMCACHE_HOST=memcache
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-82.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '3.5'

services:

app:
command: app create && add-new-config php version 8.2
environment:
- DB_HOST_SLAVE=mysql_slave
- MEMCACHE_HOST=memcache
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-83.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '3.5'

services:

app:
command: app create && add-new-config php version 8.3
environment:
- DB_HOST_SLAVE=mysql_slave
- MEMCACHE_HOST=memcache
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-config-disabled.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

app:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

app:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:

app:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.5'
networks:
lemp:
name: lemp
Expand Down Expand Up @@ -32,9 +31,10 @@ services:
- mysql
depends_on:
- mysql
restart: on-failure

mysql:
image: mysql:5.5
image: mariadb:latest
command: --innodb-use-native-aio=0
volumes:
- core-mysql-data:/var/lib/mysql
Expand Down
5 changes: 2 additions & 3 deletions www80/public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

$versaoPhp = explode('.', phpversion());
$versaoPhpFormatada = $versaoPhp[0] . $versaoPhp[1];
$versaoPhpFormatadaComPonto = $versaoPhp[0] . '.' . $versaoPhp[1];

$config = parse_ini_file(__DIR__ . "/../config.ini", true);

Expand All @@ -27,7 +26,7 @@
'bd' => ''
],
'php' => [
'version' => $versaoPhpFormatadaComPonto
'version' => $versaoPhpFormatada
]
];

Expand All @@ -53,7 +52,7 @@
'secret' => '78910'
],
'php' => [
'version' => $versaoPhpFormatadaComPonto
'version' => $versaoPhpFormatada
]
];

Expand Down

0 comments on commit 4487674

Please sign in to comment.