Skip to content

Build arm64 binaries and packages #4211

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
merged 12 commits into from
May 28, 2021
Merged

Build arm64 binaries and packages #4211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
77adaa1
Build arm64 binaries.
pstibrany May 21, 2021
7871626
Build also deb/rpm packages for arm64, and test them.
pstibrany May 21, 2021
79824e4
Don't use --platform when building docker images.
pstibrany May 21, 2021
e35024f
Fixes
pstibrany May 21, 2021
670ead7
Fixes
pstibrany May 21, 2021
a9bac00
Fixes
pstibrany May 21, 2021
0141b05
Remove tabs.
pstibrany May 21, 2021
9f74021
Remove unused tags.
pstibrany May 21, 2021
4d1d370
Added comment.
pstibrany May 21, 2021
598f45b
Don't build packages during all build.
pstibrany May 21, 2021
e72fa53
Remove unused PACKAGES var.
pstibrany May 21, 2021
2213b93
Fix digest name.
pstibrany May 27, 2021
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
95 changes: 61 additions & 34 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ endif

clean:
$(SUDO) docker rmi $(IMAGE_NAMES) >/dev/null 2>&1 || true
rm -rf -- $(UPTODATE_FILES) $(EXES) .cache $(PACKAGES) dist/*
rm -rf -- $(UPTODATE_FILES) $(EXES) .cache dist
go clean ./...

clean-protos:
Expand Down Expand Up @@ -293,33 +293,34 @@ web-serve:
cd website && hugo --config config.toml --minify -v server

# Generate binaries for a Cortex release
dist dist/cortex-linux-amd64 dist/cortex-darwin-amd64 dist/query-tee-linux-amd64 dist/query-tee-darwin-amd64 dist/cortex-linux-amd64-sha-256 dist/cortex-darwin-amd64-sha-256 dist/query-tee-linux-amd64-sha-256 dist/query-tee-darwin-amd64-sha-256:
dist: dist/$(UPTODATE)

dist/$(UPTODATE):
rm -fr ./dist
mkdir -p ./dist
GOOS="linux" GOARCH="amd64" CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/cortex-linux-amd64 ./cmd/cortex
GOOS="darwin" GOARCH="amd64" CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/cortex-darwin-amd64 ./cmd/cortex
GOOS="linux" GOARCH="amd64" CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/query-tee-linux-amd64 ./cmd/query-tee
GOOS="darwin" GOARCH="amd64" CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/query-tee-darwin-amd64 ./cmd/query-tee
sha256sum ./dist/cortex-darwin-amd64 | cut -d ' ' -f 1 > ./dist/cortex-darwin-amd64-sha-256
sha256sum ./dist/cortex-linux-amd64 | cut -d ' ' -f 1 > ./dist/cortex-linux-amd64-sha-256
sha256sum ./dist/query-tee-darwin-amd64 | cut -d ' ' -f 1 > ./dist/query-tee-darwin-amd64-sha-256
sha256sum ./dist/query-tee-linux-amd64 | cut -d ' ' -f 1 > ./dist/query-tee-linux-amd64-sha-256
for os in linux darwin; do \
for arch in amd64 arm64; do \
echo "Building Cortex for $$os/$$arch"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/cortex-$$os-$$arch ./cmd/cortex; \
sha256sum ./dist/cortex-$$os-$$arch | cut -d ' ' -f 1 > ./dist/cortex-$$os-$$arch-sha-256; \
echo "Building query-tee for $$os/$$arch"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/query-tee-$$os-$$arch ./cmd/query-tee; \
sha256sum ./dist/query-tee-$$os-$$arch | cut -d ' ' -f 1 > ./dist/query-tee-$$os-$$arch-sha-256; \
done; \
done; \
touch $@

# Generate packages for a Cortex release.
FPM_OPTS := fpm -s dir -v $(VERSION) -n cortex -f \
--license "Apache 2.0" \
--url "https://github.com/cortexproject/cortex"

FPM_ARGS := dist/cortex-linux-amd64=/usr/local/bin/cortex \
docs/configuration/single-process-config.yaml=/etc/cortex/single-process-config.yaml\

PACKAGES := dist/cortex-$(VERSION).rpm dist/cortex-$(VERSION).deb
PACKAGE_IN_CONTAINER := true
PACKAGE_IMAGE ?= $(IMAGE_PREFIX)fpm
ifeq ($(PACKAGE_IN_CONTAINER), true)

.PHONY: packages
packages: dist/cortex-linux-amd64 packaging/fpm/$(UPTODATE)
packages: dist packaging/fpm/$(UPTODATE)
@mkdir -p $(shell pwd)/.pkg
@mkdir -p $(shell pwd)/.cache
@echo ">>>> Entering build container: $@"
Expand All @@ -329,27 +330,53 @@ packages: dist/cortex-linux-amd64 packaging/fpm/$(UPTODATE)

else

packages: $(PACKAGES)

dist/%.deb: dist/cortex-linux-amd64 $(wildcard packaging/deb/**)
$(FPM_OPTS) -t deb \
--after-install packaging/deb/control/postinst \
--before-remove packaging/deb/control/prerm \
--package $@ $(FPM_ARGS) \
packaging/deb/default/cortex=/etc/default/cortex \
packaging/deb/systemd/cortex.service=/etc/systemd/system/cortex.service
sha256sum ./dist/cortex-$(VERSION).deb | cut -d ' ' -f 1 > ./dist/cortex-$(VERSION).deb-sha-256

dist/%.rpm: dist/cortex-linux-amd64 $(wildcard packaging/rpm/**)
$(FPM_OPTS) -t rpm \
--after-install packaging/rpm/control/post \
--before-remove packaging/rpm/control/preun \
--package $@ $(FPM_ARGS) \
packaging/rpm/sysconfig/cortex=/etc/sysconfig/cortex \
packaging/rpm/systemd/cortex.service=/etc/systemd/system/cortex.service
sha256sum ./dist/cortex-$(VERSION).rpm | cut -d ' ' -f 1 > ./dist/cortex-$(VERSION).rpm-sha-256
packages: dist/$(UPTODATE)-packages

dist/$(UPTODATE)-packages: dist $(wildcard packaging/deb/**) $(wildcard packaging/rpm/**)
for arch in amd64 arm64; do \
rpm_arch=x86_64; \
deb_arch=x86_64; \
if [ "$$arch" = "arm64" ]; then \
rpm_arch=aarch64; \
deb_arch=arm64; \
fi; \
$(FPM_OPTS) -t deb \
--architecture $$deb_arch \
--after-install packaging/deb/control/postinst \
--before-remove packaging/deb/control/prerm \
--package dist/cortex-$(VERSION)_$$arch.deb \
dist/cortex-linux-$$arch=/usr/local/bin/cortex \
docs/configuration/single-process-config.yaml=/etc/cortex/single-process-config.yaml \
packaging/deb/default/cortex=/etc/default/cortex \
packaging/deb/systemd/cortex.service=/etc/systemd/system/cortex.service; \
$(FPM_OPTS) -t rpm \
--architecture $$rpm_arch \
--after-install packaging/rpm/control/post \
--before-remove packaging/rpm/control/preun \
--package dist/cortex-$(VERSION)_$$arch.rpm \
dist/cortex-linux-$$arch=/usr/local/bin/cortex \
docs/configuration/single-process-config.yaml=/etc/cortex/single-process-config.yaml \
packaging/rpm/sysconfig/cortex=/etc/sysconfig/cortex \
packaging/rpm/systemd/cortex.service=/etc/systemd/system/cortex.service; \
done
for pkg in dist/*.deb dist/*.rpm; do \
sha256sum $$pkg | cut -d ' ' -f 1 > $${pkg}-sha-256; \
done; \
touch $@

endif

# Build both arm64 and amd64 images, so that we can test deb/rpm packages for both architectures.
packaging/rpm/centos-systemd/$(UPTODATE): packaging/rpm/centos-systemd/Dockerfile
$(SUDO) docker build --platform linux/amd64 --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) -t $(IMAGE_PREFIX)$(shell basename $(@D)):amd64 $(@D)/
$(SUDO) docker build --platform linux/arm64 --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) -t $(IMAGE_PREFIX)$(shell basename $(@D)):arm64 $(@D)/
touch $@

packaging/deb/debian-systemd/$(UPTODATE): packaging/deb/debian-systemd/Dockerfile
$(SUDO) docker build --platform linux/amd64 --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) -t $(IMAGE_PREFIX)$(shell basename $(@D)):amd64 $(@D)/
$(SUDO) docker build --platform linux/arm64 --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) -t $(IMAGE_PREFIX)$(shell basename $(@D)):arm64 $(@D)/
touch $@

.PHONY: test-packages
test-packages: packages packaging/rpm/centos-systemd/$(UPTODATE) packaging/deb/debian-systemd/$(UPTODATE)
./tools/packaging/test-packages $(IMAGE_PREFIX) $(VERSION)
14 changes: 10 additions & 4 deletions tools/packaging/test-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ trap cleanup EXIT

function test_with_systemd() {
local -r image=$1
local -r install_command=$2
local -r platform=$2
local -r install_command=$3
local container

container=$(docker run --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro -itd -v "$(pwd)"/dist:/opt/cortex -p 9009 "${image}")
echo "Testing $install_command on $image ($platform)"

container=$(docker run --platform="${platform}" --tmpfs /run --tmpfs /run/lock -v /sys/fs/cgroup:/sys/fs/cgroup:ro -itd -v "$(pwd)"/dist:/opt/cortex -p 9009 "${image}")
CONTAINERS+=("${container}")

port=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "9009/tcp") 0).HostPort}}' "${container}")
Expand All @@ -53,5 +56,8 @@ function test_with_systemd() {
ready 10 1 "${port}" || error "Testing image: ${image} with command: '${install_command}' failed"
}

test_with_systemd "${IMAGE_PREFIX}"debian-systemd "dpkg -i /opt/cortex/cortex-${VERSION}.deb"
test_with_systemd "${IMAGE_PREFIX}"centos-systemd "rpm -i /opt/cortex/cortex-${VERSION}.rpm"
test_with_systemd "${IMAGE_PREFIX}"debian-systemd:amd64 linux/amd64 "dpkg -i /opt/cortex/cortex-${VERSION}_amd64.deb"
test_with_systemd "${IMAGE_PREFIX}"debian-systemd:arm64 linux/arm64 "dpkg -i /opt/cortex/cortex-${VERSION}_arm64.deb"

test_with_systemd "${IMAGE_PREFIX}"centos-systemd:amd64 linux/amd64 "rpm -i /opt/cortex/cortex-${VERSION}_amd64.rpm"
test_with_systemd "${IMAGE_PREFIX}"centos-systemd:arm64 linux/arm64 "rpm -i /opt/cortex/cortex-${VERSION}_arm64.rpm"