From 3569a441611018854837fe3885cc94260ddd4566 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 26 Oct 2021 14:13:45 +0200 Subject: [PATCH] different approach to fetch upstream --- .gitlab-ci.yml | 21 --------------------- Dockerfile | 6 ++++-- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbb59cd..9548f36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,4 @@ -stages: - - prepare - - check - - build - include: - project: dockerized/commons ref: master file: gitlab-ci-template.yml - -prepare: - image: registry.hottis.de/dockerized/base-build-env:latest - stage: prepare - tags: - - hottis - - linux - - docker - artifacts: - paths: - - tmp/unbound - script: - - mkdir tmp - - cd tmp - - git clone https://github.com/NLnetLabs/unbound.git - diff --git a/Dockerfile b/Dockerfile index 1513437..26e1b20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.13 AS builder -COPY tmp/unbound/ tmp/unbound RUN \ apk update && \ apk add alpine-sdk && \ @@ -9,7 +8,10 @@ RUN \ apk add openssl-dev && \ apk add expat-dev && \ apk add libevent-dev && \ - cd tmp/unbound && \ + mkdir tmp && \ + cd tmp && \ + git clone https://github.com/NLnetLabs/unbound.git && \ + cd unbound && \ ./configure --with-libnghttp2 --with-libevent --prefix /opt/unbound && \ make && \ make install