From 4fe3e283af7a4708dee1d701e094358b551a322f Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Sat, 28 Dec 2019 15:39:03 +0100 Subject: add alpine v3.11 --- .drone.jsonnet | 4 +-- .drone.yml | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- dockerfiles.sh | 2 +- 4 files changed, 84 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 48ae089..83f4c2c 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,5 +1,5 @@ -local tags = ['v3.6', 'v3.7', 'v3.8', 'v3.9', 'v3.10', 'edge']; -local tags_armv7 = ['v3.9', 'v3.10', 'edge']; +local tags = ['v3.6', 'v3.7', 'v3.8', 'v3.9', 'v3.10', 'v3.11', 'edge']; +local tags_armv7 = ['v3.9', 'v3.10', 'v3.11', 'edge']; local pipeline(arch, darch, tags) = { kind: 'pipeline', diff --git a/.drone.yml b/.drone.yml index 0b540ce..be8c2b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -92,6 +92,22 @@ steps: depends_on: - dockerfiles +- name: v3.11 + image: plugins/docker + settings: + dockerfile: Dockerfiles/v3.11/x86/Dockerfile + password: + from_secret: docker_pass + repo: alpinelinux/docker-abuild + tags: 3.11-x86 + username: + from_secret: docker_user + when: + branch: + - master + depends_on: + - dockerfiles + - name: edge image: plugins/docker settings: @@ -202,6 +218,22 @@ steps: depends_on: - dockerfiles +- name: v3.11 + image: plugins/docker + settings: + dockerfile: Dockerfiles/v3.11/x86_64/Dockerfile + password: + from_secret: docker_pass + repo: alpinelinux/docker-abuild + tags: 3.11-x86_64 + username: + from_secret: docker_user + when: + branch: + - master + depends_on: + - dockerfiles + - name: edge image: plugins/docker settings: @@ -312,6 +344,22 @@ steps: depends_on: - dockerfiles +- name: v3.11 + image: plugins/docker + settings: + dockerfile: Dockerfiles/v3.11/aarch64/Dockerfile + password: + from_secret: docker_pass + repo: alpinelinux/docker-abuild + tags: 3.11-aarch64 + username: + from_secret: docker_user + when: + branch: + - master + depends_on: + - dockerfiles + - name: edge image: plugins/docker settings: @@ -422,6 +470,22 @@ steps: depends_on: - dockerfiles +- name: v3.11 + image: plugins/docker + settings: + dockerfile: Dockerfiles/v3.11/armhf/Dockerfile + password: + from_secret: docker_pass + repo: alpinelinux/docker-abuild + tags: 3.11-armhf + username: + from_secret: docker_user + when: + branch: + - master + depends_on: + - dockerfiles + - name: edge image: plugins/docker settings: @@ -484,6 +548,22 @@ steps: depends_on: - dockerfiles +- name: v3.11 + image: plugins/docker + settings: + dockerfile: Dockerfiles/v3.11/armv7/Dockerfile + password: + from_secret: docker_pass + repo: alpinelinux/docker-abuild + tags: 3.11-armv7 + username: + from_secret: docker_user + when: + branch: + - master + depends_on: + - dockerfiles + - name: edge image: plugins/docker settings: diff --git a/Makefile b/Makefile index 36ef49a..e01ff7d 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ VOLS = bin etc lib sbin usr var home/builder/.ccache # | jq -r '.[].name' \ # ) ## let's just manually specify some tags for now -RELEASES ?= v2.6 v2.7 v3.1 v3.2 v3.3 v3.4 v3.5 v3.6 v3.7 v3.8 v3.9 v3.10 edge +RELEASES ?= v2.6 v2.7 v3.1 v3.2 v3.3 v3.4 v3.5 v3.6 v3.7 v3.8 v3.9 v3.10 v3.11 edge ARCH := $(shell uname -m) dabuild: dabuild.in diff --git a/dockerfiles.sh b/dockerfiles.sh index ab3728a..6bb688b 100755 --- a/dockerfiles.sh +++ b/dockerfiles.sh @@ -1,7 +1,7 @@ #!/bin/sh TEMPLATE="Dockerfile.in" -RELEASES="v3.6 v3.7 v3.8 v3.9 v3.10 edge" +RELEASES="v3.6 v3.7 v3.8 v3.9 v3.10 v3.11 edge" ARCHS="x86 x86_64 armhf armv7 aarch64" die() { -- cgit v1.2.3