summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2022-12-18 22:03:48 -0700
committerSean King <seanking2919@protonmail.com>2022-12-18 22:03:48 -0700
commit60df2d8a97325367a1ad40a30fd072f5dc1e805c (patch)
tree500d7ffb3b7c3359b486011085d8fb1a56a2ca5d /ci
parent2d7ea263a1f7dba8e0a7667a95ea8af110e9be27 (diff)
parent8db82932a7998d411fa86d53b66f540714f465f3 (diff)
downloadpleroma-60df2d8a97325367a1ad40a30fd072f5dc1e805c.tar.gz
pleroma-60df2d8a97325367a1ad40a30fd072f5dc1e805c.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
Diffstat (limited to 'ci')
-rw-r--r--ci/Dockerfile7
-rw-r--r--ci/README12
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
+```