diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-12-30 14:25:45 -0700 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-12-30 14:25:45 -0700 |
| commit | dafcf896d9eadd4df5fb84545d913de355e91b29 (patch) | |
| tree | f5f3b56391efed985a6fa9ae30601c9a27908b32 /ci | |
| parent | ffeae7ef2c682dfadc01b4fae01807ad0f026fd4 (diff) | |
| parent | e25af3f2d8ee5459d20b67049da8d2e99f5d72a7 (diff) | |
| download | pleroma-dafcf896d9eadd4df5fb84545d913de355e91b29.tar.gz pleroma-dafcf896d9eadd4df5fb84545d913de355e91b29.zip | |
Merge more stuff from upstream develop branch
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 . |