opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-22 21:21:43 +08:00
Code Issues Projects Releases Wiki Activity

docker: simplify git ref resolution, thanks @chriscool

Browse Source 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
This commit is contained in:
Lars Gierth
2016-05-23 20:51:45 +02:00
parent 518f7e06a1
commit 0eed330ec2
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -1,6 +1,7 @@
.git/ .git/
!.git/HEAD !.git/HEAD
!.git/refs/ !.git/refs/
!.git/packed-refs
cmd/ipfs/ipfs cmd/ipfs/ipfs
vendor/gx/ vendor/gx/
test/ test/

6
Dockerfile
View File

@ -50,11 +50,7 @@ RUN apk add --update musl go=$GO_VERSION git bash wget ca-certificates \
# Invoke gx # Invoke gx
&& cd $SRC_PATH \ && cd $SRC_PATH \
&& gx --verbose install --global \ && gx --verbose install --global \
# We get the current commit using this hack, && mkdir .git/objects && commit=$(git rev-parse --short HEAD) \
# so that we don't have to copy all of .git/ into the build context.
# This saves us quite a bit of image size.
&& ref=$(cat .git/HEAD | grep ref | cut -d' ' -f2) \
&& commit=$(if [ -z "$ref" ]; then cat .git/HEAD; else cat ".git/$ref"; fi | head -c 7) \
&& echo "ldflags=-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \ && echo "ldflags=-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \
# Build and install IPFS and entrypoint script # Build and install IPFS and entrypoint script
&& cd $SRC_PATH/cmd/ipfs \ && cd $SRC_PATH/cmd/ipfs \

3
test/Dockerfile
View File

@ -44,8 +44,7 @@ RUN apk add --update musl go=$GO_VERSION git bash wget ca-certificates \
COPY . $SRC_PATH COPY . $SRC_PATH
RUN cd $SRC_PATH \ RUN cd $SRC_PATH \
&& ref=$(cat .git/HEAD | grep ref | cut -d' ' -f2) \ && mkdir .git/objects && commit=$(git rev-parse --short HEAD) \
&& commit=$(if [ -z "$ref" ]; then cat .git/HEAD; else cat ".git/$ref"; fi | head -c 7) \
&& echo "ldflags=-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \ && echo "ldflags=-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \
&& cd $SRC_PATH/cmd/ipfs \ && cd $SRC_PATH/cmd/ipfs \
&& go build -ldflags "-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \ && go build -ldflags "-X github.com/ipfs/go-ipfs/repo/config.CurrentCommit=$commit" \

2
test/sharness/t0300-docker-image.sh
View File

@ -70,7 +70,7 @@ test_expect_success "version CurrentCommit is set" '
docker_exec "$DOC_ID" "wget --retry-connrefused --waitretry=1 --timeout=30 -t 30 \ docker_exec "$DOC_ID" "wget --retry-connrefused --waitretry=1 --timeout=30 -t 30 \
-q -O - http://localhost:8080/version" | grep Commit | cut -d" " -f2 >actual && -q -O - http://localhost:8080/version" | grep Commit | cut -d" " -f2 >actual &&
docker_exec "$DOC_ID" "ipfs version --commit" | cut -d- -f2 >expected && docker_exec "$DOC_ID" "ipfs version --commit" | cut -d- -f2 >expected &&
[ "$(cat expected | wc -c)" -gt "1" ] && # check there actually is a commit set test -s expected && # check there actually is a commit set
test_cmp expected actual test_cmp expected actual
' '