diff options
author | marcin mikołajczak <git@mkljczk.pl> | 2022-12-27 16:41:16 +0100 |
---|---|---|
committer | marcin mikołajczak <git@mkljczk.pl> | 2022-12-27 16:41:16 +0100 |
commit | 6e51845d44cd0cee89d9ad17faee4754435d582e (patch) | |
tree | 0140eb251556159213c811fe4d472bd178d00eef /ci | |
parent | c899af1d6acad1895240a0247e9b91eca5db08df (diff) | |
parent | b367f22256edaa3536a7b2d6dea41fd472870181 (diff) | |
download | pleroma-6e51845d44cd0cee89d9ad17faee4754435d582e.tar.gz pleroma-6e51845d44cd0cee89d9ad17faee4754435d582e.zip |
Merge remote-tracking branch 'pleroma/develop' into secure-mode
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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..ca28b7029 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,7 +1,8 @@ -FROM elixir:1.9.4 +FROM elixir:1.11.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 +``` |