SYS-576 python-builder now limited to amd64 platform

instantlinux · Jul 30, 2023 · 8422f20 · 8422f20
1 parent 0c73a04
commit 8422f20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/images/python-builder/Dockerfile b/images/python-builder/Dockerfile
@@ -35,7 +35,6 @@ ARG COMPOSE_SHA=b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916
 ARG KUBECTL_SHA=4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f
 
 COPY Pipfile* /root/
-
 RUN addgroup -g $DOCKER_GID docker && \
     adduser -D -h $BUILD_DIR -u $BUILD_UID -G docker \
       -s /bin/bash $BUILD_USER && \

diff --git a/images/python-wsgi/Dockerfile b/images/python-wsgi/Dockerfile
@@ -17,6 +17,7 @@ ARG PYPILLOW_VERSION=9.5.0-r1
 ARG UWSGI_VERSION=2.0.21-r3
 
 COPY Pipfile* uwsgi.ini /usr/src/
+
 RUN apk add --virtual .fetch-deps gcc git jpeg-dev linux-headers make \
       musl-dev libwebp-dev openssl-dev pcre-dev python3-dev zlib-dev && \
     apk add --update --no-cache geos jpeg libjpeg-turbo libwebp \

diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image
@@ -25,9 +25,10 @@ endif
 ifeq ($(IMAGE),nagiosql)
   PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
 endif
-ifeq ($(IMAGE),python-builder)
+ifeq ($(IMAGE),$(filter $(IMAGE),python-builder python-wsgi))
   # helm package on arm/v6 isn't supported as of Aug 2021
-  PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
+  #  others had issues with pipenv hashes Jul 2023
+  PLATFORMS = linux/amd64
 endif
 ifeq ($(IMAGE),spamassassin)
   PLATFORMS = linux/amd64,linux/arm64