File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -19,9 +19,10 @@ FROM alpine:latest as pre-build
19
19
ARG APISIX_DASHBOARD_VERSION=master
20
20
21
21
RUN set -x \
22
- && wget https://github.com/apache/apisix-dashboard/archive/${APISIX_DASHBOARD_VERSION}.tar.gz -O /tmp/apisix-dashboard.tar.gz \
23
- && mkdir /usr/local/apisix-dashboard \
24
- && tar -xvf /tmp/apisix-dashboard.tar.gz -C /usr/local/apisix-dashboard --strip 1
22
+ && apk add --no-cache --virtual .builddeps git \
23
+ && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_VERSION} /usr/local/apisix-dashboard \
24
+ && cd /usr/local/apisix-dashboard && git clean -Xdf \
25
+ && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash
25
26
26
27
FROM golang:1.14 as api-builder
27
28
Original file line number Diff line number Diff line change 1
- master
1
+ 2.3
Original file line number Diff line number Diff line change 52
52
echo " no Version output"
53
53
exit 1
54
54
fi
55
+ # Version output
56
+ hashline=$( docker logs docker-deploy_managerapi_1 | grep -E " ^GitHash : [A-Za-z0-9\-\_\.]+" )
57
+ if [ -z " $hashline " ]; then
58
+ echo " no GitHash output"
59
+ exit 1
60
+ fi
55
61
fi
56
62
57
63
You can’t perform that action at this time.
0 commit comments