Merge pull request #15 from aptalca/multi-arch-base

Multi arch base, add dev and pr tags
aptalca · Mar 23, 2019 · fae63e9 · fae63e9
2 parents b7d45ad + fda1ea5
commit fae63e9
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 68 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -19,10 +19,54 @@ steps:
     username:
       from_secret: docker_username
   when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+    - master
     event:
     - push
     - tag
 
+- name: publish-pr
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-amd64-pr
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    event:
+    - pull_request
+
+- name: publish-branch
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-amd64-dev
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+      exclude:
+      - master
+    event:
+    - push
+
 ---
 kind: pipeline
 name: linux-arm
@@ -37,17 +81,61 @@ steps:
   settings:
     auto_tag: true
     auto_tag_suffix: linux-arm
-    dockerfile: Dockerfile.arm
+    dockerfile: Dockerfile
     password:
       from_secret: docker_password
     repo: aptalca/zap2xml
     username:
       from_secret: docker_username
   when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+    - master
     event:
     - push
     - tag
-
+
+- name: publish-pr
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-arm-pr
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    event:
+    - pull_request
+
+- name: publish-branch
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-arm-dev
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+      exclude:
+      - master
+    event:
+    - push
+
 ---
 kind: pipeline
 name: linux-arm64
@@ -62,17 +150,61 @@ steps:
   settings:
     auto_tag: true
     auto_tag_suffix: linux-arm64
-    dockerfile: Dockerfile.aarch64
+    dockerfile: Dockerfile
     password:
       from_secret: docker_password
     repo: aptalca/zap2xml
     username:
       from_secret: docker_username
   when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+    - master
     event:
     - push
     - tag
-
+
+- name: publish-pr
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-arm64-pr
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    event:
+    - pull_request
+
+- name: publish-branch
+  image: plugins/docker
+  settings:
+    tags:
+    - linux-arm64-dev
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: aptalca/zap2xml
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+      exclude:
+      - master
+    event:
+    - push
+
 ---
 kind: pipeline
 name: manifest
@@ -93,6 +225,11 @@ steps:
     username:
       from_secret: docker_username
   when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+    - master
     event:
     - push
     - tag
@@ -102,4 +239,67 @@ depends_on:
 - linux-arm
 - linux-arm64
 
+---
+kind: pipeline
+name: manifest-pr
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: server
+  image: plugins/manifest
+  settings:
+    ignore_missing: true
+    password:
+      from_secret: docker_password
+    spec: manifest-pr.tmpl
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    event:
+    - pull_request
+
+depends_on:
+- linux-amd64
+- linux-arm
+- linux-arm64
+
+---
+kind: pipeline
+name: manifest-dev
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: server
+  image: plugins/manifest
+  settings:
+    ignore_missing: true
+    password:
+      from_secret: docker_password
+    spec: manifest-dev.tmpl
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    include:
+    - refs/heads/*
+    branch:
+      exclude:
+      - master
+    event:
+    - push
+
+depends_on:
+- linux-amd64
+- linux-arm
+- linux-arm64
+
 ...
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
diff --git a/Dockerfile.arm b/Dockerfile.arm
diff --git a/manifest-dev.tmpl b/manifest-dev.tmpl
@@ -0,0 +1,19 @@
+image: aptalca/zap2xml:dev
+manifests:
+  -
+    image: aptalca/zap2xml:linux-amd64-dev
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: aptalca/zap2xml:linux-arm64-dev
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+  -
+    image: aptalca/zap2xml:linux-arm-dev
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7
diff --git a/manifest-pr.tmpl b/manifest-pr.tmpl
@@ -0,0 +1,19 @@
+image: aptalca/zap2xml:pr
+manifests:
+  -
+    image: aptalca/zap2xml:linux-amd64-pr
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: aptalca/zap2xml:linux-arm64-pr
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+  -
+    image: aptalca/zap2xml:linux-arm-pr
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7