From a5452eaf288a46ed9274760ac040818f1dcf6da0 Mon Sep 17 00:00:00 2001
From: Kelly Hair <khair@gitlab.com>
Date: Wed, 15 Apr 2020 10:00:18 -0400
Subject: [PATCH] Removing timely build want to see what is added to container
 repo

---
 .gitlab-ci.yml | 29 ++++++++++++++++++++++-------
 Dockerfile     | 14 +++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c651bdc..94f3cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,26 @@ buildx:
     - docker build --platform=local -o . ./docker-buildx
 
 
+# deploy:
+#   image: docker:19.03
+#   stage: deploy
+#   services:
+#     - name: docker:19.03-dind
+#       command: ["--experimental"]
+#   before_script:
+#     - mkdir -p ~/.docker/cli-plugins
+#     - mv buildx ~/.docker/cli-plugins/docker-buildx
+#     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+#   script:
+#     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+#     - docker buildx create --use --name mybuilder
+#     - docker buildx build --platform linux/arm64 --push -t $CI_REGISTRY_IMAGE .
+    # - docker buildx build --platform linux/arm64 . -t minio-arm64
+    # - docker tag minio-arm64 registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:latest
+    # - docker tag minio-arm64 registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:$timestamp
+    # - docker push registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:latest
+    # - docker push registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:$timestamp
+
 deploy:
   image: docker:19.03
   stage: deploy
@@ -62,11 +82,6 @@ deploy:
     - mv buildx ~/.docker/cli-plugins/docker-buildx
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker buildx create --use --name mybuilder
-    - docker buildx build --platform linux/arm64 --push -t $CI_REGISTRY_IMAGE .
-    # - docker buildx build --platform linux/arm64 . -t minio-arm64
-    # - docker tag minio-arm64 registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:latest
-    # - docker tag minio-arm64 registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:$timestamp
-    # - docker push registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:latest
-    # - docker push registry.gitlab.com/$CI_PROJECT_PATH/minio-arm64:$timestamp
\ No newline at end of file
+    - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push -t $CI_REGISTRY_IMAGE .
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 417d312..78a8b24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,10 @@ ENV GOPATH /go
 ENV CGO_ENABLED 0
 ENV GO111MODULE on
 
-RUN  \
-     apk add --no-cache git && \
-     git clone https://github.com/minio/minio && cd minio && \
-     go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"
+# RUN  \
+#      apk add --no-cache git && \
+#      git clone https://github.com/minio/minio && cd minio && \
+#      go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"
 
 FROM alpine:3.10
 
@@ -28,9 +28,9 @@ COPY --from=0 /go/bin/minio /usr/bin/minio
 COPY --from=0 /go/minio/CREDITS /third_party/
 COPY --from=0 /go/minio/dockerscripts/docker-entrypoint.sh /usr/bin/
 
-RUN  \
-     apk add --no-cache ca-certificates 'curl>7.61.0' 'su-exec>=0.2' && \
-     echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+# RUN  \
+#      apk add --no-cache ca-certificates 'curl>7.61.0' 'su-exec>=0.2' && \
+#      echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]