diff --git a/Dockerfile b/Dockerfile index 71f4dfe..9c1f697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG CHECKSUM ARG PYTHON_VERSION=3.11 RUN apk add --no-cache build-base libffi-dev perl zlib-dev diffutils libstdc++ gcompat \ - bash wget py3-cffi py3-zope-interface py3-cryptography + bash wget py3-cffi py3-zope-interface RUN wget -O duoauthproxy.tgz https://dl.duosecurity.com/duoauthproxy-${VERSION}-src.tgz RUN echo "${CHECKSUM} duoauthproxy.tgz" | sha256sum -c RUN tar xzf duoauthproxy.tgz @@ -15,7 +15,6 @@ RUN mkdir -p duoauthproxy-build/usr/local/lib/python${PYTHON_VERSION}/ RUN cp -R /usr/lib/python3.11/site-packages duoauthproxy-build/usr/local/lib/python${PYTHON_VERSION}/ RUN sed -i '/$(CFFI) \\/d' Makefile RUN sed -i '/$(ZOPE_INTERFACE) \\/d' Makefile -RUN sed -i '/$(CRYPTOGRAPHY) \\/d' Makefile RUN make RUN LD_PRELOAD=libgcompat.so.0 duoauthproxy-build/install --install-dir /app --service-user nobody --log-group nobody --create-init-script no --enable-selinux=no RUN rm -rf /app/usr/local/lib/python${PYTHON_VERSION}/test diff --git a/build.template.yml b/build.template.yml index af1d5da..82f4ff7 100644 --- a/build.template.yml +++ b/build.template.yml @@ -28,12 +28,6 @@ build:amd64: extends: .build-template variables: ARCH: amd64 -build:arm/v7: - extends: .build-template - variables: - ARCH: arm/v7 - tags: - - arm build:arm64: extends: .build-template variables: diff --git a/manifest.sh b/manifest.sh index 064677d..3b941b9 100755 --- a/manifest.sh +++ b/manifest.sh @@ -14,21 +14,17 @@ echo "${TOKEN}" | docker login -u "${USERNAME}" --password-stdin ${REGISTRY} docker buildx imagetools create \ -t "${REGISTRY_IMAGE}:${1}" \ "${REGISTRY_IMAGE}:amd64" \ - "${REGISTRY_IMAGE}:armv7" \ "${REGISTRY_IMAGE}:arm64" docker buildx imagetools create \ -t "${REGISTRY_IMAGE}:latest" \ "${REGISTRY_IMAGE}:amd64" \ - "${REGISTRY_IMAGE}:armv7" \ "${REGISTRY_IMAGE}:arm64" docker buildx imagetools create \ -t "${REGISTRY_IMAGE2}:${1}" \ "${REGISTRY_IMAGE}:amd64" \ - "${REGISTRY_IMAGE}:armv7" \ "${REGISTRY_IMAGE}:arm64" docker buildx imagetools create \ -t "${REGISTRY_IMAGE2}:latest" \ "${REGISTRY_IMAGE}:amd64" \ - "${REGISTRY_IMAGE}:armv7" \ "${REGISTRY_IMAGE}:arm64"