Compare commits

...

6 Commits

9 changed files with 15 additions and 123 deletions

View File

@ -141,7 +141,7 @@ local PipelineBuildContainer(arch='amd64') = {
},
{
name: 'dryrun',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
dry_run: true,
dockerfile: 'docker/Dockerfile.' + arch,
@ -154,7 +154,7 @@ local PipelineBuildContainer(arch='amd64') = {
},
{
name: 'publish-dockerhub',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
auto_tag: true,
auto_tag_suffix: arch,
@ -170,7 +170,7 @@ local PipelineBuildContainer(arch='amd64') = {
},
{
name: 'publish-quay',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
auto_tag: true,
auto_tag_suffix: arch,
@ -241,7 +241,6 @@ local PipelineDocs = {
'build-binaries',
'build-container-amd64',
'build-container-arm64',
'build-container-arm',
],
trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
@ -345,7 +344,6 @@ local PipelineNotifications = {
PipelineBuildBinaries,
PipelineBuildContainer(arch='amd64'),
PipelineBuildContainer(arch='arm64'),
PipelineBuildContainer(arch='arm'),
PipelineDocs,
PipelineNotifications,
]

View File

@ -111,7 +111,7 @@ steps:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
dockerfile: docker/Dockerfile.amd64
dry_run: true
@ -123,7 +123,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -141,7 +141,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -183,7 +183,7 @@ steps:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
dockerfile: docker/Dockerfile.arm64
dry_run: true
@ -195,7 +195,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -213,7 +213,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -240,78 +240,6 @@ trigger:
depends_on:
- test
---
kind: pipeline
name: build-container-arm
platform:
os: linux
arch: arm
steps:
- name: build
image: golang:1.19
commands:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
settings:
dockerfile: docker/Dockerfile.arm
dry_run: true
repo: thegeeklab/${DRONE_REPO_NAME}
when:
ref:
- refs/pull/**
depends_on:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
settings:
auto_tag: true
auto_tag_suffix: arm
dockerfile: docker/Dockerfile.arm
password:
from_secret: docker_password
repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
settings:
auto_tag: true
auto_tag_suffix: arm
dockerfile: docker/Dockerfile.arm
password:
from_secret: quay_password
registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: quay_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- test
---
kind: pipeline
name: docs
@ -360,7 +288,6 @@ depends_on:
- build-binaries
- build-container-amd64
- build-container-arm64
- build-container-arm
---
kind: pipeline
@ -454,6 +381,6 @@ depends_on:
---
kind: signature
hmac: 0a77c46102c68670b7ede37ef6d17d78b72cc21dacf919c6081c9a37baa0888e
hmac: 2678272f471334df973c0b9c0e8886dcf0941f5581b460b116fb48c88e7a14ba
...

View File

@ -20,7 +20,7 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
GENERATE ?=
XGO_VERSION := go-1.19.x
XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
XGO_TARGETS ?= linux/amd64,linux/arm64
TAGS ?= netgo

View File

@ -1,5 +1,7 @@
# drone-docker
> DISCONTINUED: This image is no longer maintained and will be removed in the future.
Drone plugin to build multiarch Docker images
[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-docker?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-docker)

View File

@ -1,4 +1,4 @@
FROM amd64/docker:19.03-dind@sha256:1875a3437d87a2fa8ec5e6fcd3233a98d571fa9692516b1e7d8eb18b7dca87a4
FROM amd64/docker:20.10-dind@sha256:56a2d342dd7f25fd604f71513f765526bd522f3c256bead83b6d30c5a8006fa6
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

View File

@ -1,23 +0,0 @@
FROM arm32v7/docker:19.03-dind@sha256:f998921d365053bf7e3f98794f6c23ca44e6809832d78105bc4d2da6bb8521ed
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.title="drone-docker"
LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-docker"
LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-docker"
LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-docker"
ENV DOCKER_HOST=unix:///var/run/docker.sock
RUN apk --update add --virtual .build-deps curl && \
mkdir -p /etc/docker/ && \
curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \
sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \
chmod 600 /etc/docker/default.json && \
apk del .build-deps && \
rm -rf /var/cache/apk/* && \
rm -rf /tmp/*
ADD dist/drone-docker /bin/
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker"]

View File

@ -1,4 +1,4 @@
FROM arm64v8/docker:19.03-dind@sha256:81f35202223dcd33991fcb0e12d287f854dfb63b0b47e0c805ed87c0dfc4c9b3
FROM arm64v8/docker:20.10-dind@sha256:26c7da097331ba685a7314fcfc0eb608b86b4074bab5e1beaeb57d744c5c060a
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: quay.io/thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7