mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
build: use initial checkout within container
speedup and simplify the build within the container
This commit is contained in:
@@ -7,20 +7,7 @@
|
||||
GOPATH=/go
|
||||
REPO_PATH=$GOPATH/src/github.com/grafana/grafana
|
||||
|
||||
mkdir -p /go/src/github.com/grafana
|
||||
cd /go/src/github.com/grafana
|
||||
|
||||
if [ "$CIRCLE_TAG" != "" ]; then
|
||||
echo "Builing from tag $CIRCLE_TAG"
|
||||
git clone https://github.com/grafana/grafana.git
|
||||
cd $REPO_PATH
|
||||
git checkout $CIRCLE_TAG
|
||||
else
|
||||
echo "Building from branch $CIRCLE_BRANCH"
|
||||
git clone --depth 1 https://github.com/grafana/grafana.git -b $CIRCLE_BRANCH
|
||||
cd $REPO_PATH
|
||||
fi
|
||||
|
||||
cd /go/src/github.com/grafana/grafana
|
||||
echo "current dir: $(pwd)"
|
||||
|
||||
if [ "$CIRCLE_TAG" != "" ]; then
|
||||
@@ -47,7 +34,3 @@ else
|
||||
echo "Packaging incremental build for $CIRCLE_BRANCH"
|
||||
go run build.go -buildNumber=${CIRCLE_BUILD_NUM} package latest
|
||||
fi
|
||||
|
||||
cp dist/* /tmp/dist/
|
||||
|
||||
|
||||
|
||||
@@ -5,8 +5,10 @@ mkdir -p dist
|
||||
echo "Circle branch: ${CIRCLE_BRANCH}"
|
||||
echo "Circle tag: ${CIRCLE_TAG}"
|
||||
docker run -i -t --name gfbuild \
|
||||
-v $(pwd)/dist:/tmp/dist \
|
||||
-v $(pwd):/go/src/github.com/grafana/grafana \
|
||||
-e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
|
||||
-e "CIRCLE_TAG=${CIRCLE_TAG}" \
|
||||
-e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}" \
|
||||
grafana/buildcontainer
|
||||
|
||||
sudo chown -R ${USER:=$(/usr/bin/id -run)}:$USER dist
|
||||
|
||||
Reference in New Issue
Block a user