From 0aa5c1b625a004ae72f5498a05910a7b83fb9571 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Wed, 16 Jun 2021 15:54:32 +0200
Subject: [PATCH] Pass env vars, push does build now

---
 compose.yml | 8 +++++---
 makefile    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compose.yml b/compose.yml
index 7c75902..204b3fc 100644
--- a/compose.yml
+++ b/compose.yml
@@ -5,10 +5,12 @@ services:
   app:
     image: "decentral1se/pubspace:latest"
     environment:
-      - MASTODON_ACCESS_TOKEN_FILE=/run/secrets/access_token
-      - NEXTCLOUD_APP_PASSWORD_FILE=/run/secrets/app_password
-      - MASTODON_API_BASE_URL
       - APP_LOG_LEVEL
+      - MASTODON_ACCESS_TOKEN_FILE=/run/secrets/access_token
+      - MASTODON_API_BASE_URL
+      - NEXTCLOUD_API_BASE_URL
+      - NEXTCLOUD_APP_PASSWORD_FILE=/run/secrets/app_password
+      - NEXTCLOUD_USER
     secrets:
       - access_token
       - app_password
diff --git a/makefile b/makefile
index 66d1621..6f99ccf 100644
--- a/makefile
+++ b/makefile
@@ -12,5 +12,5 @@ run:
 build:
 	@docker build -t decentral1se/pubspace .
 
-push:
+push: build
 	@docker push decentral1se/pubspace