diff options
author | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
---|---|---|
committer | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
commit | f7c20731034f7aa3c72a6dcc312850db27787f7e (patch) | |
tree | 58c7727f73a0a7184865e45c18b6af5e91c51be5 /ci | |
parent | f8afba95b20670b5d6e93896ccd27bb3fca003a2 (diff) | |
parent | 80a2528fd10ca2d07b8d96258a19bd9a8ea747ec (diff) | |
download | pleroma-f7c20731034f7aa3c72a6dcc312850db27787f7e.tar.gz |
Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
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 +``` |