Skip to content

Commit

Permalink
Fix snapshot builds for 5.6
Browse files Browse the repository at this point in the history
This partially reverts elastic#6461 in the 5.6 branch. It looks like the release-manager
uses a reasonably new Golang in the master/6.x branch but still uses go1.6 in
the 5.6 branch. That causes problems when using the vendor folder, so i reverted
to the old `go get`. It's more susceptible to transient errors, but that was stable
for quite long.

Also added `--force-yes` on the debian6 apt-gets, to avoid the key error. I didn't
investigate if the backport of the deb7 change would be possible. If yes, that would
be preferable, but I leave to @andrewkroh.
  • Loading branch information
tsg committed Mar 14, 2018
1 parent 7231910 commit 7cb0469
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dev-tools/packer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ package-dashboards:

.PHONY: deps
deps:
cd ../vendor/github.com/tsg/gotpl; go install
go get -u github.com/tsg/gotpl

.PHONY: xgo-image
xgo-image:
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packer/docker/xgo-image-deb6/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN chmod +x $FETCH
# Make sure apt-get is up to date and dependent packages are installed
RUN \
apt-get -o Acquire::Check-Valid-Until=false update && \
apt-get install -y automake autogen build-essential ca-certificates \
apt-get install -y --force-yes automake autogen build-essential ca-certificates \
gcc-multilib \
clang llvm-dev libtool libxml2-dev uuid-dev libssl-dev pkg-config \
patch make xz-utils cpio wget unzip git mercurial bzr rsync --no-install-recommends
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
rm libpcap0.8-dev*.deb
RUN \
apt-get -o Acquire::Check-Valid-Until=false update && \
apt-get install -y libpcap0.8-dev
apt-get install -y --force-yes libpcap0.8-dev


# Old git version which does not support proxy with go get directly, and git cloning
Expand Down

0 comments on commit 7cb0469

Please sign in to comment.