Skip to content

Commit 05d0701

Browse files
authored
Merge branch 'master' into automatic-release
2 parents 51326d4 + ae17db0 commit 05d0701

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Deprecated
2+
_All future changelogs in [GitHub Releases](https://github.com/sourcetoad/DevopsToolKit/releases)._
3+
4+
---
5+
16
# v1.3.0 (November 9, 2020)
27
* Retire non `st-internal` network names (not yet removed).
38
* Remove outdated python and upsource documentation.

DOCKER_TIPS.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ docker system prune
2424

2525
## Passwords
2626

27-
* PostgreSQL
28-
* `username: postgres_user`
29-
* `password: postgres_pass`
3027
* MariaDB
3128
* `username: mariadb_user`
3229
* `password: mariadb_pass`

docker/data-source-services/docker-compose.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ services:
1616
- ./proxy_increase.conf:/etc/nginx/proxy.conf
1717
networks:
1818
- st-internal
19-
postgres94:
20-
image: postgres:9.4
21-
container_name: sourcetoad_postgres94
22-
ports:
23-
- "5494:5432"
24-
environment:
25-
- POSTGRES_USER=postgres_user
26-
- POSTGRES_PASSWORD=postgres_pass
27-
networks:
28-
- st-internal
29-
command: "postgres
30-
-c logging_collector='on'
31-
-c log_directory='/var/log/postgresql'
32-
-c log_filename='%Y-%m-%d.log'
33-
-c log_line_prefix='%t %v '
34-
-c log_statement='all'"
3519
mariadb105:
3620
image: mariadb:10.5
3721
container_name: sourcetoad_mariadb105

examples/laravel/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0-fpm
1+
FROM php:8.1-fpm
22

33
# System dependencies needed
44
RUN apt-get update && apt-get install --no-install-recommends -y \

examples/laravel/config/php.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ xdebug.mode = debug
1515
xdebug.client_host = host.docker.internal
1616
xdebug.client_port = 9000
1717
xdebug.discover_client_host = no
18+
xdebug.log = /tmp/xdebug.log
19+
xdebug.log_level = 3
1820
xdebug.start_with_request = yes
1921
xdebug.idekey = xdebug
2022
xdebug.max_nesting_level = 256

0 commit comments

Comments
 (0)