From f82d8b4905254eea1096543275e55529f354ddb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Mon, 7 Aug 2023 23:59:02 +0200 Subject: [PATCH 1/6] Drone definition --- .drone.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..bd65f84 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,18 @@ +kind: pipeline +name: default + +steps: +- name: docker + image: plugins/docker + settings: + registry: git.jvalver.de + username: + from_secret: username + password: + from_secret: password + repo: thilawyn/protonmail-bridge-docker + dockerfile: Dockerfile + context: ./build + autotag: true + compress: true + platform: linux/amd64 -- 2.49.1 From 3172cf355d8c6ddebb774b9db03c3bbec594adf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 8 Aug 2023 00:24:07 +0200 Subject: [PATCH 2/6] Attempt at fixing the build context --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index bd65f84..07c4693 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,8 @@ steps: password: from_secret: password repo: thilawyn/protonmail-bridge-docker - dockerfile: Dockerfile - context: ./build + dockerfile: build/Dockerfile + context: build autotag: true compress: true platform: linux/amd64 -- 2.49.1 From 0d57ee5ad2ec48937e71698cdcbdde0a24e72f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 8 Aug 2023 00:36:54 +0200 Subject: [PATCH 3/6] Switched to golang:1.20-bookworm as build image --- build/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1971c40..9fdce7a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,4 @@ -# Use carlosedp/golang for riscv64 support -FROM carlosedp/golang:1.18 AS build +FROM golang:1.20-bookworm AS build # Install dependencies RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev -- 2.49.1 From 9be9f6af208bb7f3087b2c619085789aa12a7b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 8 Aug 2023 00:53:09 +0200 Subject: [PATCH 4/6] Attempt at fixing the Docker repo path --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 07c4693..720bc3d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,12 +5,11 @@ steps: - name: docker image: plugins/docker settings: - registry: git.jvalver.de username: from_secret: username password: from_secret: password - repo: thilawyn/protonmail-bridge-docker + repo: git.jvalver.de/thilawyn/protonmail-bridge-docker dockerfile: build/Dockerfile context: build autotag: true -- 2.49.1 From 21584e2b5cd7406468aeabaefd11d9ca935dbe1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 8 Aug 2023 00:54:49 +0200 Subject: [PATCH 5/6] Added registry option --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 720bc3d..3b99516 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,7 @@ steps: - name: docker image: plugins/docker settings: + registry: git.jvalver.de username: from_secret: username password: -- 2.49.1 From 5ecf76ed622f76dafc76c77b214d09dc01f4efb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 8 Aug 2023 01:39:16 +0200 Subject: [PATCH 6/6] Different pipelines for master and other branches --- .drone.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3b99516..1d04d0d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,37 @@ kind: pipeline -name: default +type: docker +name: docker-build steps: -- name: docker +- name: build + image: plugins/docker + settings: + registry: git.jvalver.de + username: + from_secret: username + password: + from_secret: password + repo: git.jvalver.de/thilawyn/protonmail-bridge-docker + dockerfile: build/Dockerfile + dry_run: true + context: build + autotag: true + compress: true + platform: linux/amd64 + +trigger: + branch: + exclude: + - master + + +--- +kind: pipeline +type: docker +name: docker-build-and-publish + +steps: +- name: build-and-publish image: plugins/docker settings: registry: git.jvalver.de @@ -16,3 +45,7 @@ steps: autotag: true compress: true platform: linux/amd64 + +trigger: + branch: + - master -- 2.49.1