Merge pull request 'Moving some more tools into builder image [CI SKIP]' (#53) from builder-upgrade into dev

Reviewed-on: Chewing_Bever/vieter#53
pull/60/head
Jef Roosens 2022-01-22 22:38:49 +01:00
commit b1fa83971d
2 changed files with 6 additions and 2 deletions

View File

@ -8,6 +8,7 @@ skip_clone: true
pipeline: pipeline:
prepare: prepare:
image: 'chewingbever/vlang:latest' image: 'chewingbever/vlang:latest'
pull: true
secrets: [ s3_username, s3_password ] secrets: [ s3_username, s3_password ]
commands: commands:
- git clone "$CI_REPO_REMOTE" . - git clone "$CI_REPO_REMOTE" .

View File

@ -11,14 +11,17 @@ ENV VFLAGS -cc gcc
RUN mkdir -p /opt/vlang && \ RUN mkdir -p /opt/vlang && \
ln -s /opt/vlang/v /usr/bin/v && \ ln -s /opt/vlang/v /usr/bin/v && \
apk --no-cache add \ apk --no-cache add \
git make gcc \ git make gcc curl openssl \
musl-dev \ musl-dev \
openssl-libs-static openssl-dev \ openssl-libs-static openssl-dev \
zlib-static bzip2-static xz-dev expat-static zstd-static lz4-static \ zlib-static bzip2-static xz-dev expat-static zstd-static lz4-static \
sqlite-static sqlite-dev \ sqlite-static sqlite-dev \
libx11-dev glfw-dev freetype-dev \ libx11-dev glfw-dev freetype-dev \
libarchive-static libarchive-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 COPY . /vlang-local