Skip to content

Commit f1f9c36

Browse files
DISTMYSQL-423: Improve code formatting checks, adjust Docker images to use go-1.22.3
https://perconadev.atlassian.net/browse/DISTMYSQL-423 1. Use go-1.22.3 docker images 2. Improved code formatting check (handled the result)
1 parent 469ccb4 commit f1f9c36

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
1515
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
1616

17-
FROM golang:1.20.3-alpine3.17 as build
17+
FROM golang:1.22.3-alpine3.20 as build
1818

1919
ENV GOPATH=/tmp/go
2020

@@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde
2828
RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ /
2929
RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json
3030

31-
FROM alpine:3.17
31+
FROM alpine:3.20
3232

3333
RUN apk --no-cache add bash curl jq
3434

docker/Dockerfile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
1515
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
1616

17-
FROM golang:1.20.3-bullseye
17+
FROM golang:1.22.3-bullseye
1818

1919
RUN apt-get update
2020
RUN apt-get install -y ruby ruby-dev rubygems build-essential

docker/Dockerfile.raft

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20.3-bullseye
1+
FROM golang:1.22.3-bullseye
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update -q -y

docker/Dockerfile.system

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20.3-bullseye
1+
FROM golang:1.22.3-bullseye
22
LABEL maintainer="[email protected]"
33

44
ARG ci_env_repo="https://github.com/percona/orchestrator-ci-env.git"

docker/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20.3-bullseye
1+
FROM golang:1.22.3-bullseye
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update

script/test-source

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ validate_source_code_conventions() {
44
echo "# Verifying code is formatted via 'gofmt -s -w go/'"
55
gofmt -s -w go/
66
git diff --exit-code --quiet go/
7+
if [[ $? -ne 0 ]]; then
8+
# Echo the message containing + FAIL string to allow Jenkins script to catch the failure.
9+
echo "Code formatting check result: + FAIL"
10+
git diff go/
11+
exit 1
12+
fi
13+
echo "Code formatting check result: PASSED"
714
}
815

916
validate_source_code_conventions

0 commit comments

Comments
 (0)