From 93440cacf2f710cc9c5a7346808a4e5a346503c4 Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Wed, 24 Feb 2021 21:41:48 +0100 Subject: [PATCH] Split build into pipelines --- .drone.yml | 15 ++++++++++++--- glibc-shared/Dockerfile | 2 +- musl-static/Dockerfile | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 747fbe7..fc13c3e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,11 +1,13 @@ kind: pipeline -name: default +type: docker +name: glibc-shared steps: -- name: glibc-shared +- name: build image: plugins/docker settings: dockerfile: glibc-shared/Dockerfile + context: glibc-shared username: from_secret: docker_username password: @@ -14,10 +16,17 @@ steps: tags: - shared -- name: musl-static +--- +kind: pipeline +type: docker +name: musl-static + +steps: +- name: build image: plugins/docker settings: dockerfile: musl-static/Dockerfile + context: musl-static username: from_secret: docker_username password: diff --git a/glibc-shared/Dockerfile b/glibc-shared/Dockerfile index fda7333..8cb969c 100644 --- a/glibc-shared/Dockerfile +++ b/glibc-shared/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:rolling # dialog when e.g. installing tzdata ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y && apt-get upgrade -y && apt-get install -y\ +RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \ # Base dependencies for: `git push` xwim build ## meson/build essentials build-essential cmake pkg-config meson ninja-build g++ doxygen git \ diff --git a/musl-static/Dockerfile b/musl-static/Dockerfile index 22fc53b..5f407aa 100644 --- a/musl-static/Dockerfile +++ b/musl-static/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.13 ENV LDFLAGS="-static-libgcc -static-libstdc++ -static" RUN apk add --no-cache \ - build-base cmake git meson pkgconf doxygen graphviz \ + build-base cmake git meson pkgconf doxygen graphviz zip \ libarchive-static libarchive-dev \ libressl-dev \ tclap-dev \