Minor changes for my usage
This commit is contained in:
11
Dockerfile
11
Dockerfile
@ -1,11 +1,12 @@
|
|||||||
FROM elixir:1.11.4-alpine
|
FROM elixir:1.11.4-alpine
|
||||||
|
|
||||||
ARG PLEROMA_VER=develop
|
ARG PLEROMA_VER=stable
|
||||||
ARG UID=911
|
ARG UID=1001
|
||||||
ARG GID=911
|
ARG GID=1001
|
||||||
ENV MIX_ENV=prod
|
ENV MIX_ENV=prod
|
||||||
|
|
||||||
RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories \
|
RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/main" >> /etc/apk/repositories \
|
||||||
|
&& echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories \
|
||||||
&& apk update \
|
&& apk update \
|
||||||
&& apk add git gcc g++ musl-dev make cmake file-dev \
|
&& apk add git gcc g++ musl-dev make cmake file-dev \
|
||||||
exiftool imagemagick libmagic ncurses postgresql-client ffmpeg
|
exiftool imagemagick libmagic ncurses postgresql-client ffmpeg
|
||||||
@ -23,7 +24,7 @@ RUN mkdir -p /etc/pleroma \
|
|||||||
USER pleroma
|
USER pleroma
|
||||||
WORKDIR /pleroma
|
WORKDIR /pleroma
|
||||||
|
|
||||||
RUN git clone -b develop https://git.pleroma.social/pleroma/pleroma.git /pleroma \
|
RUN git clone -b stable https://git.pleroma.social/pleroma/pleroma.git /pleroma \
|
||||||
&& git checkout ${PLEROMA_VER}
|
&& git checkout ${PLEROMA_VER}
|
||||||
|
|
||||||
RUN echo "import Mix.Config" > config/prod.secret.exs \
|
RUN echo "import Mix.Config" > config/prod.secret.exs \
|
||||||
|
@ -9,10 +9,10 @@ services:
|
|||||||
test: ["CMD", "pg_isready", "-U", "pleroma"]
|
test: ["CMD", "pg_isready", "-U", "pleroma"]
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: pleroma
|
POSTGRES_USER: pleroma
|
||||||
POSTGRES_PASSWORD: ChangeMe!
|
POSTGRES_PASSWORD: fhJTdQGtiawUe7JuiY
|
||||||
POSTGRES_DB: pleroma
|
POSTGRES_DB: pleroma
|
||||||
volumes:
|
volumes:
|
||||||
- ./postgres:/var/lib/postgresql/data
|
- ~/data/postgres:/var/lib/postgresql/data
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: pleroma
|
image: pleroma
|
||||||
@ -31,20 +31,20 @@ services:
|
|||||||
# Feel free to remove or override this section
|
# Feel free to remove or override this section
|
||||||
# See 'Build-time variables' in README.md
|
# See 'Build-time variables' in README.md
|
||||||
args:
|
args:
|
||||||
- "UID=1000"
|
- "UID=1001"
|
||||||
- "GID=1000"
|
- "GID=1001"
|
||||||
- "PLEROMA_VER=v2.4.2"
|
- "PLEROMA_VER=v2.4.2"
|
||||||
volumes:
|
volumes:
|
||||||
- ./uploads:/var/lib/pleroma/uploads
|
- ~/data/uploads:/var/lib/pleroma/uploads
|
||||||
- ./static:/var/lib/pleroma/static
|
- ~/data/static:/var/lib/pleroma/static
|
||||||
- ./config.exs:/etc/pleroma/config.exs:ro
|
- ~/data/config:/etc/pleroma/config.exs:ro
|
||||||
environment:
|
environment:
|
||||||
DOMAIN: example.com
|
DOMAIN: myprivate.social
|
||||||
INSTANCE_NAME: Pleroma
|
INSTANCE_NAME: Pleroma
|
||||||
ADMIN_EMAIL: admin@example.com
|
ADMIN_EMAIL: chris@chrisdeluca.com
|
||||||
NOTIFY_EMAIL: notify@example.com
|
NOTIFY_EMAIL: notify@chrisdeluca.com
|
||||||
DB_USER: pleroma
|
DB_USER: pleroma
|
||||||
DB_PASS: ChangeMe!
|
DB_PASS: fhJTdQGtiawUe7JuiY
|
||||||
DB_NAME: pleroma
|
DB_NAME: pleroma
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
Reference in New Issue
Block a user