From 58633a383a4a40824d83346e951e82a660babb78 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 14 Aug 2017 11:08:59 -0700 Subject: [PATCH] Deprecate intel-32, arm64, arm support for minio builds. (#4811) It was decided that we will be deprecating ARM support for minio builds. ARM users should simply compile from source. Additionally 32bit version of Linux, Windows and FreeBSD (64bit) are deprecated. --- .travis.yml | 12 ------------ Dockerfile.aarch64 | 30 ------------------------------ Dockerfile.armhf | 30 ------------------------------ Dockerfile.release.aarch64 | 25 ------------------------- Dockerfile.release.armhf | 25 ------------------------- README.md | 14 -------------- README_ZH.md | 5 ----- buildscripts/build.sh | 2 +- 8 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 Dockerfile.aarch64 delete mode 100644 Dockerfile.armhf delete mode 100644 Dockerfile.release.aarch64 delete mode 100644 Dockerfile.release.armhf diff --git a/.travis.yml b/.travis.yml index 4e1ad3d15..1494266cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,18 +23,6 @@ script: - make test GOFLAGS="-timeout 15m -race -v" - make coverage -# Refer https://blog.hypriot.com/post/setup-simple-ci-pipeline-for-arm-images/ -# push image -- > - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$ARCH" == "x86_64" ]; then - docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker build -t minio/minio:edge-armhf . -f Dockerfile.armhf - docker build -t minio/minio:edge-aarch64 . -f Dockerfile.aarch64 - docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" - docker push minio/minio:edge-armhf - docker push minio/minio:edge-aarch64 - fi - after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 40c3964fc..000000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,30 +0,0 @@ -FROM resin/aarch64-alpine:3.6 - -MAINTAINER Minio Inc - -ENV GOPATH /go -ENV PATH $PATH:$GOPATH/bin -ENV CGO_ENABLED 0 - -WORKDIR /go/src/github.com/minio/ - -RUN \ - apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps git go musl-dev && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ - go get -v -d github.com/minio/minio && \ - cd /go/src/github.com/minio/minio && \ - go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)" && \ - rm -rf /go/pkg /go/src /usr/local/go && apk del .build-deps - -EXPOSE 9000 - -COPY buildscripts/docker-entrypoint.sh /usr/bin/ - -RUN chmod +x /usr/bin/docker-entrypoint.sh - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -VOLUME ["/export"] - -CMD ["minio"] diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 71ddbbf1f..000000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,30 +0,0 @@ -FROM resin/armhf-alpine:3.6 - -MAINTAINER Minio Inc - -ENV GOPATH /go -ENV PATH $PATH:$GOPATH/bin -ENV CGO_ENABLED 0 - -WORKDIR /go/src/github.com/minio/ - -RUN \ - apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps git go musl-dev && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ - go get -v -d github.com/minio/minio && \ - cd /go/src/github.com/minio/minio && \ - go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)" && \ - rm -rf /go/pkg /go/src /usr/local/go && apk del .build-deps - -EXPOSE 9000 - -COPY buildscripts/docker-entrypoint.sh /usr/bin/ - -RUN chmod +x /usr/bin/docker-entrypoint.sh - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -VOLUME ["/export"] - -CMD ["minio"] diff --git a/Dockerfile.release.aarch64 b/Dockerfile.release.aarch64 deleted file mode 100644 index e1a7ec5e3..000000000 --- a/Dockerfile.release.aarch64 +++ /dev/null @@ -1,25 +0,0 @@ -FROM resin/aarch64-alpine:3.6 - -MAINTAINER Minio Inc - -COPY buildscripts/docker-entrypoint.sh buildscripts/healthcheck.sh /usr/bin/ - -RUN \ - apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps curl && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ - curl https://dl.minio.io/server/minio/release/linux-arm64/minio > /usr/bin/minio && \ - chmod +x /usr/bin/minio && \ - chmod +x /usr/bin/docker-entrypoint.sh && \ - chmod +x /usr/bin/healthcheck.sh - -EXPOSE 9000 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -VOLUME ["/export"] - -HEALTHCHECK --interval=30s --timeout=5s \ - CMD /usr/bin/healthcheck.sh - -CMD ["minio"] diff --git a/Dockerfile.release.armhf b/Dockerfile.release.armhf deleted file mode 100644 index e71edba14..000000000 --- a/Dockerfile.release.armhf +++ /dev/null @@ -1,25 +0,0 @@ -FROM resin/armhf-alpine:3.6 - -MAINTAINER Minio Inc - -COPY buildscripts/docker-entrypoint.sh buildscripts/healthcheck.sh /usr/bin/ - -RUN \ - apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps curl && \ - echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \ - curl https://dl.minio.io/server/minio/release/linux-arm/minio > /usr/bin/minio && \ - chmod +x /usr/bin/minio && \ - chmod +x /usr/bin/docker-entrypoint.sh && \ - chmod +x /usr/bin/healthcheck.sh - -EXPOSE 9000 - -ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] - -VOLUME ["/export"] - -HEALTHCHECK --interval=30s --timeout=5s \ - CMD /usr/bin/healthcheck.sh - -CMD ["minio"] diff --git a/README.md b/README.md index 5129399ba..18c128534 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,6 @@ chmod 755 minio | Platform| Architecture | URL| | ----------| -------- | ------| |GNU/Linux|64-bit Intel|https://dl.minio.io/server/minio/release/linux-amd64/minio | -| |32-bit Intel|https://dl.minio.io/server/minio/release/linux-386/minio | -| |32-bit ARM|https://dl.minio.io/server/minio/release/linux-arm/minio | -| |64-bit ARM|https://dl.minio.io/server/minio/release/linux-arm64/minio | -| |32-bit ARMv6|https://dl.minio.io/server/minio/release/linux-arm6vl/minio | ```sh chmod +x minio ./minio server ~/Photos @@ -62,7 +58,6 @@ chmod +x minio | Platform| Architecture | URL| | ----------| -------- | ------| |Microsoft Windows|64-bit|https://dl.minio.io/server/minio/release/windows-amd64/minio.exe | -| |32-bit|https://dl.minio.io/server/minio/release/windows-386/minio.exe | ```sh minio.exe server D:\Photos ``` @@ -78,15 +73,6 @@ sysrc minio_disks=/home/user/Photos service minio start ``` -### Binary Download -| Platform| Architecture | URL| -| ----------| -------- | ------| -|FreeBSD|64-bit|https://dl.minio.io/server/minio/release/freebsd-amd64/minio | -```sh -chmod 755 minio -./minio server ~/Photos -``` - ## Install from Source Source installation is only intended for developers and advanced users. If you do not have a working Golang environment, please follow [How to install Golang](https://docs.minio.io/docs/how-to-install-golang). diff --git a/README_ZH.md b/README_ZH.md index 05d463920..d56d04836 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -9,13 +9,8 @@ Minio是一个非常轻量的服务,可以很简单的和其他应用的结合 | Platform| Architecture | URL| | ----------| -------- | ------| |GNU/Linux|64-bit Intel|https://dl.minio.io/server/minio/release/linux-amd64/minio| -||32-bit Intel|https://dl.minio.io/server/minio/release/linux-386/minio| -||32-bit ARM|https://dl.minio.io/server/minio/release/linux-arm/minio| -||64-bit ARM|https://dl.minio.io/server/minio/release/linux-arm64/minio| -||32-bit ARMv6|https://dl.minio.io/server/minio/release/linux-arm6vl/minio| |Apple OS X|64-bit Intel|https://dl.minio.io/server/minio/release/darwin-amd64/minio| |Microsoft Windows|64-bit|https://dl.minio.io/server/minio/release/windows-amd64/minio.exe| -||32-bit|https://dl.minio.io/server/minio/release/windows-386/minio.exe| |FreeBSD|64-bit|https://dl.minio.io/server/minio/release/freebsd-amd64/minio| ### Homebrew 安装 diff --git a/buildscripts/build.sh b/buildscripts/build.sh index f7f9c435a..ef546faea 100755 --- a/buildscripts/build.sh +++ b/buildscripts/build.sh @@ -23,7 +23,7 @@ _init() { fi # List of supported architectures - SUPPORTED_OSARCH='linux/386 linux/amd64 linux/arm linux/arm64 windows/386 windows/amd64 darwin/amd64 freebsd/amd64' + SUPPORTED_OSARCH='linux/amd64 windows/amd64 darwin/amd64' ## System binaries CP=`which cp`