Skip to content

Commit

Permalink
ci: latest mysql 5.7 container image removed /etc/mysql/mysql.conf.d,…
Browse files Browse the repository at this point in the history
… remove our workaround for setting the socket path

with docker-library/mysql#867 images without distro tag are now built on oracle linux by default.
this change removed /etc/mysql/mysql.conf.d from the image, see also docker-library/mysql#876.
this also means we no longer need to work around the socket path being overridden in another config file and we can use the same logic as on all other images.
  • Loading branch information
Nothing4You committed Jul 7, 2022
1 parent fb85893 commit d62de0e
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -584,13 +584,7 @@ jobs:
# we need to ensure that the socket path is writable for the user running the DB process in the container
sudo chmod 0777 /tmp/run-${{ join(matrix.db, '-') }}
# mysql 5.7 container overrides the socket path in /etc/mysql/mysql.conf.d/mysqld.cnf
if [ "${{ join(matrix.db, '-') }}" = "mysql-5.7" ]
then
docker container cp "${{ github.workspace }}/tests/ssl_resources/socket.cnf" mysqld:/etc/mysql/mysql.conf.d/zz-aiomysql-socket.cnf
else
docker container cp "${{ github.workspace }}/tests/ssl_resources/socket.cnf" mysqld:/etc/mysql/conf.d/aiomysql-socket.cnf
fi
docker container cp "${{ github.workspace }}/tests/ssl_resources/socket.cnf" mysqld:/etc/mysql/conf.d/aiomysql-socket.cnf
docker container start mysqld
Expand Down

0 comments on commit d62de0e

Please sign in to comment.