From a1dd6c0c3634a452d963d364a750afe0ac2ae47a Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 22 Jan 2022 22:37:27 +0100 Subject: [PATCH] Moving some more tools into builder image [CI SKIP] --- .woodpecker/.release.yml | 1 + Dockerfile.builder | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 9da27be7..2e32c7f9 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -8,6 +8,7 @@ skip_clone: true pipeline: prepare: image: 'chewingbever/vlang:latest' + pull: true secrets: [ s3_username, s3_password ] commands: - git clone "$CI_REPO_REMOTE" . diff --git a/Dockerfile.builder b/Dockerfile.builder index 48048f80..ff2761ff 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -11,14 +11,17 @@ ENV VFLAGS -cc gcc RUN mkdir -p /opt/vlang && \ ln -s /opt/vlang/v /usr/bin/v && \ apk --no-cache add \ - git make gcc \ + git make gcc curl openssl \ musl-dev \ openssl-libs-static openssl-dev \ zlib-static bzip2-static xz-dev expat-static zstd-static lz4-static \ sqlite-static sqlite-dev \ libx11-dev glfw-dev freetype-dev \ libarchive-static libarchive-dev \ - diffutils + diffutils && \ + # yes yes I know this is amd64, it's okay + wget -O /usr/local/bin/mc https://dl.min.io/client/mc/release/linux-amd64/mc && \ + chmod +x /usr/local/bin/mc COPY . /vlang-local