diff options
| author | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
| commit | c80096522cad1255f53e171359bc0266822c6441 (patch) | |
| tree | 102a7e13b2e4c11af54e14a9ab0b3be216ce6013 /ci | |
| parent | 9a27cb4f9d314fe1066f566de71357f55926116e (diff) | |
| parent | b5266097a1e73bd749d8176e327c14fcb9735f95 (diff) | |
| download | pleroma-c80096522cad1255f53e171359bc0266822c6441.tar.gz | |
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/Dockerfile | 7 | ||||
| -rwxr-xr-x | ci/build_and_push.sh | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile new file mode 100644 index 000000000..e6a8b438c --- /dev/null +++ b/ci/Dockerfile @@ -0,0 +1,7 @@ +FROM elixir:1.9.4 + +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force + diff --git a/ci/build_and_push.sh b/ci/build_and_push.sh new file mode 100755 index 000000000..484cc2643 --- /dev/null +++ b/ci/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:latest --push . |