Skip to content

Commit 2c255ca

Browse files
committed
wip
1 parent 46376dc commit 2c255ca

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,10 @@ jobs:
576576
# unfortunately we need this hacky workaround as GitHub Actions service containers can't reference data from our repo.
577577
- name: Prepare mysql
578578
run: |
579+
# we need to ensure that the socket path is readable from haproxy and
580+
# writable for the user running the DB process
581+
sudo chmod 0777 /tmp/run-${{ join(matrix.db, '-') }}
582+
579583
# inject HAproxy configuration
580584
docker container stop haproxy
581585
@@ -597,9 +601,6 @@ jobs:
597601
docker container cp "${{ github.workspace }}/tests/ssl_resources/tls.cnf" mysqld:/etc/mysql/conf.d/aiomysql-tls.cnf
598602
599603
# use custom socket path
600-
# we need to ensure that the socket path is writable for the user running the DB process in the container
601-
sudo chmod 0777 /tmp/run-${{ join(matrix.db, '-') }}
602-
603604
docker container cp "${{ github.workspace }}/tests/ssl_resources/socket.cnf" mysqld:/etc/mysql/conf.d/aiomysql-socket.cnf
604605
605606
docker container start mysqld

tests/ssl_resources/haproxy.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ global
2020
defaults
2121
mode tcp
2222
log global
23+
option tcplog
2324
timeout connect 10s
2425
timeout client 1m
2526
timeout server 1m

0 commit comments

Comments
 (0)