Skip to content

Commit

Permalink
Merge pull request #1290 from gliderlabs/drop-arm
Browse files Browse the repository at this point in the history
chore: drop linux/arm (32-bit) support
  • Loading branch information
josegonzalez authored Aug 19, 2024
2 parents ddb2042 + 9ce969f commit cbc0b49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ build/docker:
build/docker/$(STACK_VERSION): bindata.go
ifeq ($(BUILDX),true)
ifeq ($(STACK_VERSION),20)
docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest .
docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest .
else
docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) .
docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) .
endif
else
docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) .
Expand Down
12 changes: 1 addition & 11 deletions bin/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,13 @@ setup_02="$(cat /tmp/setup-02.sh)"
echo "$setup_01" >/tmp/setup-01.sh
chmod +x /tmp/setup-01.sh

# Ensure we install from ports for arm/arm64 systems
# Ensure we install from ports for arm64 systems
# Skip unsupported syslinux
if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then
sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh
sed -i '/syslinux/d' /tmp/setup-01.sh
fi

# Skip unsupported postgresql on arm:20
if [[ "$TARGETARCH" == "arm" ]]; then
sed -i '/postgresql-client-16/d' /tmp/setup-01.sh
fi

# from base image
/tmp/setup-01.sh

Expand All @@ -41,11 +36,6 @@ rm -rf /var/lib/apt/lists/*
echo "$setup_02" >/tmp/setup-02.sh
chmod +x /tmp/setup-02.sh

# Skip unsupported postgresql on arm:20
if [[ "$TARGETARCH" == "arm" ]]; then
sed -i '/postgresql-server-dev-16/d' /tmp/setup-02.sh
fi

# from build image
/tmp/setup-02.sh

Expand Down

0 comments on commit cbc0b49

Please sign in to comment.