Skip to content

[fix][build] Build test container image using current hardware platform #1205

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 2 commits into from
Apr 17, 2024
Merged

[fix][build] Build test container image using current hardware platform #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd65f3d
Support specifying container platform
dragosvictor Mar 20, 2024
0294e1a
Fix arch name mismatch on x86_64
dragosvictor Apr 12, 2024
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
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ ARG PULSAR_IMAGE=apachepulsar/pulsar:latest
FROM $PULSAR_IMAGE
USER root
ARG GO_VERSION=1.18
ARG ARCH=amd64

RUN curl -L https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -o golang.tar.gz && \
RUN curl -L https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz -o golang.tar.gz && \
mkdir -p /pulsar/go && tar -C /pulsar -xzf golang.tar.gz

ENV PATH /pulsar/go/bin:$PATH
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ IMAGE_NAME = pulsar-client-go-test:latest
PULSAR_VERSION ?= 3.2.0
PULSAR_IMAGE = apachepulsar/pulsar:$(PULSAR_VERSION)
GO_VERSION ?= 1.18
CONTAINER_ARCH ?= $(shell uname -m | sed s/x86_64/amd64/)

# Golang standard bin directory.
GOPATH ?= $(shell go env GOPATH)
Expand All @@ -38,8 +39,10 @@ bin/golangci-lint:
GOBIN=$(shell pwd)/bin go install github.com/golangci/golangci-lint/cmd/[email protected]

container:
docker build -t ${IMAGE_NAME} --build-arg GO_VERSION="${GO_VERSION}" \
--build-arg PULSAR_IMAGE="${PULSAR_IMAGE}" .
docker build -t ${IMAGE_NAME} \
--build-arg GO_VERSION="${GO_VERSION}" \
--build-arg PULSAR_IMAGE="${PULSAR_IMAGE}" \
--build-arg ARCH="${CONTAINER_ARCH}" .

test: container
docker run -i ${IMAGE_NAME} bash -c "cd /pulsar/pulsar-client-go && ./scripts/run-ci.sh"
Expand Down