From 2cb786d1635c4f7eee350dd1421730b323cce853 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 12 Oct 2021 11:04:48 +0200
Subject: [PATCH] use prebuilt ocis binary for eos builds

---
 .drone.star                     | 15 ++++++++++----
 ocis/.dockerignore              |  1 +
 ocis/docker/eos-ocis/Dockerfile | 36 +++------------------------------
 ocis/docker/eos-ocis/user.go    | 13 ------------
 4 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 ocis/docker/eos-ocis/user.go

diff --git a/.drone.star b/.drone.star
index 37019964a..d01ac47c4 100644
--- a/.drone.star
+++ b/.drone.star
@@ -988,15 +988,22 @@ def dockerEos(ctx):
             "os": "linux",
             "arch": "amd64",
         },
-        "steps": makeGenerate("ocis") +
-                 build() + [
+        "steps": makeGenerate("") + [
+            {
+                "name": "build",
+                "image": "owncloudci/golang:1.17",
+                "pull": "always",
+                "commands": [
+                    "make -C ocis release-linux-docker",
+                ],
+            },
             {
                 "name": "dryrun-eos-ocis",
                 "image": "plugins/docker:latest",
                 "pull": "always",
                 "settings": {
                     "dry_run": True,
-                    "context": "ocis/docker/eos-ocis",
+                    "context": "ocis",
                     "tags": "linux-eos-ocis",
                     "dockerfile": "ocis/docker/eos-ocis/Dockerfile",
                     "repo": "owncloud/eos-ocis",
@@ -1021,7 +1028,7 @@ def dockerEos(ctx):
                         "from_secret": "docker_password",
                     },
                     "auto_tag": True,
-                    "context": "ocis/docker/eos-ocis",
+                    "context": "ocis",
                     "dockerfile": "ocis/docker/eos-ocis/Dockerfile",
                     "repo": "owncloud/eos-ocis",
                 },
diff --git a/ocis/.dockerignore b/ocis/.dockerignore
index 26258eb15..9efc25271 100644
--- a/ocis/.dockerignore
+++ b/ocis/.dockerignore
@@ -1,3 +1,4 @@
 *
 !dist/
 !bin/
+!docker
diff --git a/ocis/docker/eos-ocis/Dockerfile b/ocis/docker/eos-ocis/Dockerfile
index 0ebb60fd9..29b559320 100644
--- a/ocis/docker/eos-ocis/Dockerfile
+++ b/ocis/docker/eos-ocis/Dockerfile
@@ -1,37 +1,7 @@
-FROM centos:7 as build
-ARG BRANCH=master
-
-ENV CGO_ENABLED=1
-ENV GOOS=linux
-RUN rpm --rebuilddb && yum -y install \
-    wget \
-    time \
-    make \
-    gcc \
-    git
-RUN wget -q https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz
-RUN mkdir -p /usr/local/bin
-RUN tar xf go1.17.2.linux-amd64.tar.gz -C /usr/local
-RUN ln -s /usr/local/go/bin/* /usr/local/bin
-RUN git clone https://github.com/owncloud/ocis.git
-RUN cd ocis && git checkout ${BRANCH}
-RUN cd ocis && git log -n 1
-RUN cd ocis/ocis && go build -v -o ../bin/ocis -toolexec '/usr/bin/time -v' ./cmd/ocis
-# RUN cd ocis && make generate bin/ocis
-
-# build user lookup test program
-RUN mkdir -p /build
-COPY user.go /build/user.go
-RUN cd /build && go build -o user user.go
-
-
 FROM owncloud/eos-base:4.8.26
 RUN mkdir -p /usr/local/bin
-COPY --from=build ocis/bin/ocis /usr/local/bin/
+COPY dist/binaries/ocis-linux-amd64 /usr/local/bin/ocis
 RUN chmod +x /usr/local/bin/ocis
 
-COPY --from=build /build/user /usr/local/bin/user
-RUN chmod +x /usr/local/bin/user
-
-COPY setup /setup
-COPY entrypoint /entrypoint
+COPY docker/eos-ocis/setup /setup
+COPY docker/eos-ocis/entrypoint /entrypoint
diff --git a/ocis/docker/eos-ocis/user.go b/ocis/docker/eos-ocis/user.go
deleted file mode 100644
index 7b9319004..000000000
--- a/ocis/docker/eos-ocis/user.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	gouser "os/user"
-)
-
-func main() {
-	username := os.Args[1]
-	user, err := gouser.Lookup(username)
-	fmt.Printf("User %#v %#v %#v\n", username, user, err)
-}