From aa4c2429e3dbce85fe18ce6d87c6d47ffc7c489b Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Tue, 18 Oct 2022 09:53:27 +0200 Subject: [PATCH] pleroma update --- .gitignore | 1 + pleroma/Dockerfile | 2 +- pleroma/Makefile | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 962b018..85a285e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gitolite/.env ansible/.env ansible/known_hosts +*/out/image-name diff --git a/pleroma/Dockerfile b/pleroma/Dockerfile index 7c18052..f4c18f9 100644 --- a/pleroma/Dockerfile +++ b/pleroma/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.13-alpine as build +FROM elixir:1.14-alpine as build ENV MIX_ENV=prod diff --git a/pleroma/Makefile b/pleroma/Makefile index 0afad38..ff13690 100644 --- a/pleroma/Makefile +++ b/pleroma/Makefile @@ -3,12 +3,14 @@ REGISTRY=registry.monotremata.xyz IMG=$(REGISTRY)/$(IMG_NAME) PLATFORMS=linux/amd64 -.PHONY: build push buildx +.PHONY: push buildx -build: Dockerfile entrypoint.sh +out/image-name: Dockerfile entrypoint.sh + mkdir -p $(@D) docker build -t $(IMG) . + @echo $(IMG) > $(@) -push: build +push: out/image-name docker image push $(IMG) buildx: Dockerfile entrypoint.sh