From d4e8c6fb44fa454fae1dfa98c92f788f12b96c3c Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 22 Apr 2022 17:53:16 +0200 Subject: [PATCH 1/4] Update golang-mysql integration image --- docker/test/integration/mysql_golang_client/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile index 68b0aaab42c..8197485b0aa 100644 --- a/docker/test/integration/mysql_golang_client/Dockerfile +++ b/docker/test/integration/mysql_golang_client/Dockerfile @@ -1,10 +1,12 @@ # docker build -t clickhouse/mysql-golang-client . # MySQL golang client docker container -FROM golang:1.13 +FROM golang:1.17 -RUN go get "github.com/go-sql-driver/mysql" +WORKDIR /opt COPY ./main.go main.go -RUN go build main.go +RUN go mod init none \ + && go get \ + && go build main.go From 11694459f3e7aee6cde21e65f26180186014955c Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 22 Apr 2022 17:54:34 +0200 Subject: [PATCH 2/4] Update mysql_php_client php version --- docker/test/integration/mysql_php_client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test/integration/mysql_php_client/Dockerfile b/docker/test/integration/mysql_php_client/Dockerfile index 0fb77bf8ffb..55db4d15a7f 100644 --- a/docker/test/integration/mysql_php_client/Dockerfile +++ b/docker/test/integration/mysql_php_client/Dockerfile @@ -1,7 +1,7 @@ # docker build -t clickhouse/mysql-php-client . # MySQL PHP client docker container -FROM php:7.3-cli +FROM php:8.0.18-cli COPY ./client.crt client.crt COPY ./client.key client.key From e434d78e68ff7afc9716a665bbec98253db9d4c5 Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Fri, 22 Apr 2022 23:02:22 +0200 Subject: [PATCH 3/4] fixup! Update golang-mysql integration image --- docker/test/integration/mysql_golang_client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile index 8197485b0aa..9cfd5d3620a 100644 --- a/docker/test/integration/mysql_golang_client/Dockerfile +++ b/docker/test/integration/mysql_golang_client/Dockerfile @@ -8,5 +8,5 @@ WORKDIR /opt COPY ./main.go main.go RUN go mod init none \ - && go get \ + && go get github.com/go-sql-driver/mysql@master \ && go build main.go From 04a8955427e937d1629e2c90d4103a77737e570a Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Sat, 23 Apr 2022 15:24:42 +0200 Subject: [PATCH 4/4] fixup! Update golang-mysql integration image --- docker/test/integration/mysql_golang_client/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile index 9cfd5d3620a..5281f786ae2 100644 --- a/docker/test/integration/mysql_golang_client/Dockerfile +++ b/docker/test/integration/mysql_golang_client/Dockerfile @@ -8,5 +8,5 @@ WORKDIR /opt COPY ./main.go main.go RUN go mod init none \ - && go get github.com/go-sql-driver/mysql@master \ + && go get github.com/go-sql-driver/mysql@217d05049 \ && go build main.go