From 897c9352a35aab2a146ae06ecc3b4c08fa56c414 Mon Sep 17 00:00:00 2001
From: Laszlo Fogas <laszlo@laszlo.cloud>
Date: Thu, 4 Apr 2019 21:18:28 +0200
Subject: [PATCH] Building OSS

---
 .dockerignore |  2 ++
 .drone.sh     | 20 ++++++++++----------
 .drone.yml    | 39 ++++++++++++++++++++++++---------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 858594f58..8c5bfe506 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
 *
 !release/*
+.env
+
diff --git a/.drone.sh b/.drone.sh
index cbb8d63fb..f82021cdd 100755
--- a/.drone.sh
+++ b/.drone.sh
@@ -1,28 +1,28 @@
 #!/bin/sh
 
 # only execute this script as part of the pipeline.
-[ -z "$CI" ] && echo "missing ci environment variable" && exit 2
+# [ -z "$CI" ] && echo "missing ci environment variable" && exit 2
 
 # only execute the script when github token exists.
-[ -z "$SSH_KEY" ] && echo "missing ssh key" && exit 3
+# [ -z "$SSH_KEY" ] && echo "missing ssh key" && exit 3
 
 # write the ssh key.
-mkdir /root/.ssh
-echo -n "$SSH_KEY" > /root/.ssh/id_rsa
-chmod 600 /root/.ssh/id_rsa
+# mkdir /root/.ssh
+# echo -n "$SSH_KEY" > /root/.ssh/id_rsa
+# chmod 600 /root/.ssh/id_rsa
 
 # add github.com to our known hosts.
-touch /root/.ssh/known_hosts
-chmod 600 /root/.ssh/known_hosts
-ssh-keyscan -H github.com > /etc/ssh/ssh_known_hosts 2> /dev/null
+# touch /root/.ssh/known_hosts
+# chmod 600 /root/.ssh/known_hosts
+# ssh-keyscan -H github.com > /etc/ssh/ssh_known_hosts 2> /dev/null
 
 # clone the extras project.
 set -e
 set -x
-git clone git@github.com:drone/drone-enterprise.git extras
+# git clone git@github.com:drone/drone-enterprise.git extras
 
 # build a static binary with the build number and extra features.
-go build -ldflags '-extldflags "-static" -X github.com/laszlocph/drone-oss-08/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-server github.com/laszlocph/drone-oss-08/extras/cmd/drone-server
+go build -ldflags '-extldflags "-static" -X github.com/laszlocph/drone-oss-08/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-server github.com/laszlocph/drone-oss-08/cmd/drone-server
 GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/laszlocph/drone-oss-08/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-agent             github.com/laszlocph/drone-oss-08/cmd/drone-agent
 GOOS=linux GOARCH=arm64 CGO_ENABLED=0         go build -ldflags '-X github.com/laszlocph/drone-oss-08/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/linux/arm64/drone-agent github.com/laszlocph/drone-oss-08/cmd/drone-agent
 GOOS=linux GOARCH=arm   CGO_ENABLED=0 GOARM=7 go build -ldflags '-X github.com/laszlocph/drone-oss-08/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/linux/arm/drone-agent   github.com/laszlocph/drone-oss-08/cmd/drone-agent
diff --git a/.drone.yml b/.drone.yml
index e12a29636..e4ad934a4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,13 +33,12 @@ pipeline:
   build:
     image: golang:1.8
     commands: sh .drone.sh
-    secrets: [ ssh_key ]
     when:
       event: [ push, tag ]
 
   publish_server_alpine:
     image: plugins/docker
-    repo: drone/drone
+    repo: laszlocloud/drone-oss-08-server
     dockerfile: Dockerfile.alpine
     secrets: [ docker_username, docker_password ]
     tag: [ alpine ]
@@ -49,7 +48,17 @@ pipeline:
 
   publish_server:
     image: plugins/docker
-    repo: drone/drone
+    repo: laszlocloud/drone-oss-08-server
+    secrets: [ docker_username, docker_password ]
+    tag: [ latest ]
+    when:
+      branch: master
+      event: push
+
+  publish_agent:
+    image: plugins/docker
+    repo: laszlocloud/drone-oss-08-agent
+    dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
     when:
@@ -58,7 +67,7 @@ pipeline:
 
   publish_agent_alpine:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent.alpine
     secrets: [ docker_username, docker_password ]
     tag: [ alpine ]
@@ -68,7 +77,7 @@ pipeline:
 
   publish_agent_arm:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent.linux.arm
     secrets: [ docker_username, docker_password ]
     tag: [ linux-arm ]
@@ -78,7 +87,7 @@ pipeline:
 
   publish_agent_arm64:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent.linux.arm64
     secrets: [ docker_username, docker_password ]
     tag: [ linux-arm64 ]
@@ -88,7 +97,7 @@ pipeline:
 
   publish_agent_amd64:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
@@ -98,36 +107,36 @@ pipeline:
 
   release_server_alpine:
     image: plugins/docker
-    repo: drone/drone
+    repo: laszlocloud/drone-oss-08-server
     dockerfile: Dockerfile.alpine
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8-alpine ]
+    tag: [ 0.8.91-alpine ]
     when:
       event: tag
 
   release_agent_alpine:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent.alpine
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8-alpine ]
+    tag: [ 0.8.91-alpine ]
     when:
       event: tag
 
   release_server:
     image: plugins/docker
-    repo: drone/drone
+    repo: laszlocloud/drone-oss-08-server
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.9 ]
+    tag: [ 0.8.91 ]
     when:
       event: tag
 
   release_agent:
     image: plugins/docker
-    repo: drone/agent
+    repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8, 0.8.9 ]
+    tag: [ 0.8.91 ]
     when:
       event: tag