Skip to content

Commit

Permalink
Merge pull request #486 from planetscale/disable_cgo
Browse files Browse the repository at this point in the history
Disable CGO usage in builds
  • Loading branch information
mattlord authored Oct 9, 2023
2 parents 9b8bb5d + 94b6946 commit b1640f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FROM golang:1.20.2 AS build
ENV GO111MODULE=on
WORKDIR /go/src/planetscale.dev/vitess-operator
COPY . /go/src/planetscale.dev/vitess-operator
RUN go install /go/src/planetscale.dev/vitess-operator/cmd/manager
RUN CGO_ENABLED=0 go install /go/src/planetscale.dev/vitess-operator/cmd/manager

# The rest is meant to mimic the output from operator-sdk's Dockerfile.
# We just copy the binary we built inside Docker instead of from outside.
Expand Down
14 changes: 7 additions & 7 deletions test/endtoend/operator/101_initial_cluster_backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ spec:
path: /backup
type: Directory
images:
vtctld: vitess/lite:v17.0.2-mysql57
vtgate: vitess/lite:v17.0.2-mysql57
vttablet: vitess/lite:v17.0.2-mysql57
vtorc: vitess/lite:v17.0.2-mysql57
vtbackup: vitess/lite:v17.0.2-mysql57
vtctld: vitess/lite:v17.0.2
vtgate: vitess/lite:v17.0.2
vttablet: vitess/lite:v17.0.2
vtorc: vitess/lite:v17.0.2
vtbackup: vitess/lite:v17.0.2
mysqld:
mysql56Compatible: vitess/lite:v17.0.2-mysql57
mysql56Compatible: vitess/lite:v17.0.2
mysqldExporter: prom/mysqld-exporter:v0.11.0
cells:
- name: zone1
Expand Down Expand Up @@ -213,4 +213,4 @@ stringData:
RESET MASTER;
# We need to set super_read_only back to what it was before
SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON');
SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON');

0 comments on commit b1640f8

Please sign in to comment.