diff options
| author | feld <feld@feld.me> | 2022-09-18 02:31:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2022-09-18 02:31:26 +0000 |
| commit | 7ac4e858a019891ce5873936db1b4a0ec0566a97 (patch) | |
| tree | 3d4bae55d6eb3124fa8f0c7475b2646e4012a890 /ci | |
| parent | 1fff9a25208b3cdedf4f8172378e019a01eca320 (diff) | |
| parent | 1a7107f4a5595e8723c594ca8cc58e70bcca529f (diff) | |
| download | pleroma-7ac4e858a019891ce5873936db1b4a0ec0566a97.tar.gz | |
Merge branch 'develop' into 'finch_everywhere'
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/Dockerfile | 7 | ||||
| -rw-r--r-- | ci/README | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile index e6a8b438c..d39fd8d7b 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,7 +1,8 @@ -FROM elixir:1.9.4 +FROM elixir:1.10.4 +# Single RUN statement, otherwise intermediate images are created +# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run RUN apt-get update &&\ - apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ mix local.hex --force &&\ mix local.rebar --force - diff --git a/ci/README b/ci/README new file mode 100644 index 000000000..3785adef1 --- /dev/null +++ b/ci/README @@ -0,0 +1,12 @@ +## Dependencies + +Assuming an AMD64 Alpine system, you're going to need the following packages +- `qemu qemu-openrc qemu-arm qemu-aarch64` for binfmt +- `docker-cli-buildx` for building the images + +## Setting up + +``` +docker login git.pleroma.social:5050 +doas rc-service qemu-binfmt start +``` |