From ec89f53d6cf33b5be20eebe2b8ee4c075ccb9773 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 14 Dec 2020 11:40:50 +0800 Subject: [PATCH] Only one build --- Dockerfile | 17 +++++++++-------- Dockerfile.multi => Dockerfile.old | 17 ++++++++--------- Jenkinsfile | 9 --------- 3 files changed, 17 insertions(+), 26 deletions(-) rename Dockerfile.multi => Dockerfile.old (54%) diff --git a/Dockerfile b/Dockerfile index bcca4aa..e0e134b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,17 @@ -FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 AS builder LABEL Maintainer = "Jonathan Ervine " -ENV GETIPLAYER_OUTPUT=/config GETIPLAYER_PROFILE=/config/.get_iplayer PUID=1000 PGID=100 PORT=1935 -EXPOSE 1935 -VOLUME /config +WORKDIR /root/ -RUN apk --update --no-cache add ffmpeg perl-cgi perl-mojolicious perl-lwp-protocol-https perl-xml-libxml jq logrotate su-exec tini +RUN apk --update --no-cache add git cmake make gcc gcc-c++ -RUN wget -qnd "https://bitbucket.org/shield007/atomicparsley/raw/68337c0c05ec4ba2ad47012303121aaede25e6df/downloads/build_linux_x86_64/AtomicParsley" && \ - install -m 755 -t /usr/local/bin ./AtomicParsley && \ - rm ./AtomicParsley +RUN git clone https://github.com/wez/atomicparsley atomic \ + cd atomic \ + cmake . && cmake --build . --config Release +FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 + +COPY --from=builder /root/atomic/AtomicParsley /usr/local/bin/AtomicParsley RUN wget -qO - "https://api.github.com/repos/get-iplayer/get_iplayer/releases/latest" > /tmp/latest.json && \ echo get_iplayer release `jq -r .name /tmp/latest.json` && \ wget -qO - "`jq -r .tarball_url /tmp/latest.json`" | tar -zxf - && \ diff --git a/Dockerfile.multi b/Dockerfile.old similarity index 54% rename from Dockerfile.multi rename to Dockerfile.old index e0e134b..bcca4aa 100644 --- a/Dockerfile.multi +++ b/Dockerfile.old @@ -1,17 +1,16 @@ -FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 AS builder +FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 LABEL Maintainer = "Jonathan Ervine " -WORKDIR /root/ +ENV GETIPLAYER_OUTPUT=/config GETIPLAYER_PROFILE=/config/.get_iplayer PUID=1000 PGID=100 PORT=1935 +EXPOSE 1935 +VOLUME /config -RUN apk --update --no-cache add git cmake make gcc gcc-c++ +RUN apk --update --no-cache add ffmpeg perl-cgi perl-mojolicious perl-lwp-protocol-https perl-xml-libxml jq logrotate su-exec tini -RUN git clone https://github.com/wez/atomicparsley atomic \ - cd atomic \ - cmake . && cmake --build . --config Release +RUN wget -qnd "https://bitbucket.org/shield007/atomicparsley/raw/68337c0c05ec4ba2ad47012303121aaede25e6df/downloads/build_linux_x86_64/AtomicParsley" && \ + install -m 755 -t /usr/local/bin ./AtomicParsley && \ + rm ./AtomicParsley -FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 - -COPY --from=builder /root/atomic/AtomicParsley /usr/local/bin/AtomicParsley RUN wget -qO - "https://api.github.com/repos/get-iplayer/get_iplayer/releases/latest" > /tmp/latest.json && \ echo get_iplayer release `jq -r .name /tmp/latest.json` && \ wget -qO - "`jq -r .tarball_url /tmp/latest.json`" | tar -zxf - && \ diff --git a/Jenkinsfile b/Jenkinsfile index 8dcd413..f9f0356 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,14 +33,5 @@ spec: stage('Notify gchat') { hangoutsNotify message: "Alpine Linux 3.12.1 with BBC iPlayer has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } - stage('Build multi-stage with Kaniko') { - git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-get_iplayer.git', credentialsId: 'jenkins-to-git' - container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile.multi -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/get_iplayer:3.26-1' - } - } - stage('Notify gchatof multi-stage build') { - hangoutsNotify message: "Alpine Linux 3.12.1 with BBC iPlayer 3.26-1 (multi-stage docker build) has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false - } } }