logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 88ec5c2de5cba6530889de1dd04bcb161c4ad1bd
parent: 2bc2b321b6b56cbb50b484181042ccaae3d8707c
Author: lain <lain@soykaf.club>
Date:   Thu, 13 Aug 2020 12:28:10 +0000

Merge branch 'cmake' into 'develop'

Build files: Add cmake

See merge request pleroma/pleroma!2882

Diffstat:

M.gitlab-ci.yml2+-
MDockerfile2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -212,7 +212,7 @@ amd64-musl: cache: *release-cache variables: *release-variables before_script: &before-release-musl - - apk add git gcc g++ musl-dev make + - apk add git gcc g++ musl-dev make cmake - echo "import Mix.Config" > config/prod.secret.exs - mix local.hex --force - mix local.rebar --force diff --git a/Dockerfile b/Dockerfile @@ -4,7 +4,7 @@ COPY . . ENV MIX_ENV=prod -RUN apk add git gcc g++ musl-dev make &&\ +RUN apk add git gcc g++ musl-dev make cmake &&\ echo "import Mix.Config" > config/prod.secret.exs &&\ mix local.hex --force &&\ mix local.rebar --force &&\