Skip to content

Commit 8422f20

Browse files
committed
SYS-576 python-builder now limited to amd64 platform
1 parent 0c73a04 commit 8422f20

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

images/python-builder/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ ARG COMPOSE_SHA=b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916
3535
ARG KUBECTL_SHA=4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f
3636

3737
COPY Pipfile* /root/
38-
3938
RUN addgroup -g $DOCKER_GID docker && \
4039
adduser -D -h $BUILD_DIR -u $BUILD_UID -G docker \
4140
-s /bin/bash $BUILD_USER && \

images/python-wsgi/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ARG PYPILLOW_VERSION=9.5.0-r1
1717
ARG UWSGI_VERSION=2.0.21-r3
1818

1919
COPY Pipfile* uwsgi.ini /usr/src/
20+
2021
RUN apk add --virtual .fetch-deps gcc git jpeg-dev linux-headers make \
2122
musl-dev libwebp-dev openssl-dev pcre-dev python3-dev zlib-dev && \
2223
apk add --update --no-cache geos jpeg libjpeg-turbo libwebp \

lib/build/Makefile.docker_image

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ endif
2525
ifeq ($(IMAGE),nagiosql)
2626
PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
2727
endif
28-
ifeq ($(IMAGE),python-builder)
28+
ifeq ($(IMAGE),$(filter $(IMAGE),python-builder python-wsgi))
2929
# helm package on arm/v6 isn't supported as of Aug 2021
30-
PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
30+
# others had issues with pipenv hashes Jul 2023
31+
PLATFORMS = linux/amd64
3132
endif
3233
ifeq ($(IMAGE),spamassassin)
3334
PLATFORMS = linux/amd64,linux/arm64

0 commit comments

Comments
 (0)