Skip to content

docker/bootstrap: Add back VT_MYSQL_ROOT. #5185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sougou merged 2 commits into from
Sep 13, 2019
Merged

docker/bootstrap: Add back VT_MYSQL_ROOT. #5185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8278be0
docker/bootstrap: Add back VT_MYSQL_ROOT.
enisoc Sep 12, 2019
f97a82b
Use Go modules to run goyacc.
enisoc Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/bootstrap/Dockerfile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV VTPORTSTART 15000
ENV PYTHONPATH $VTROOT/dist/grpc/usr/local/lib/python2.7/site-packages:$VTROOT/dist/py-mock-1.0.1/lib/python2.7/site-packages:$VTROOT/py-vtdb:$VTROOT/dist/selenium/lib/python2.7/site-packages
ENV GOBIN $VTROOT/bin
ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/chromedriver:$PATH
ENV VT_MYSQL_ROOT /usr
ENV PKG_CONFIG_PATH $VTROOT/lib
ENV USER vitess
ENV GO111MODULE on
Expand Down
2 changes: 1 addition & 1 deletion go/vt/sqlparser/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
MAKEFLAGS = -s

sql.go: sql.y
goyacc -o sql.go sql.y
go run golang.org/x/tools/cmd/goyacc -o sql.go sql.y
gofmt -w sql.go

clean:
Expand Down
3 changes: 2 additions & 1 deletion tools/check_make_parser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
CUR="sql.go"
TMP="/tmp/sql.$$.go"

set -e

if ! cd go/vt/sqlparser/ ; then
echo "ERROR: $0 must be run in the root project directory"
exit 1
fi

mv $CUR $TMP
output=`goyacc -o $CUR sql.y`
output=$(go run golang.org/x/tools/cmd/goyacc -o $CUR sql.y)

if [ -n "$output" ]; then
echo "Expected empty output from goyacc, got:"
Expand Down