From 76cf23ef975f9df58c93cb02a216b94c2c279d5c Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Wed, 9 Oct 2019 20:34:31 +0200
Subject: [PATCH] consume latest server build

---
 Makefile           |  3 +--
 bootstrap.yml      | 12 ++++++++++++
 docker-compose.yml |  3 +++
 nginx.conf         | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 bootstrap.yml

diff --git a/Makefile b/Makefile
index aa5a312..ff1303e 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ howto:
 
 bootstrap:
 	@echo "Bootstrapping Server service ..."
-	@docker-compose run server make bootstrap
+	@docker-compose run server bootstrap
 	@echo ""
 	@echo "You can now log into the development backend using the following credentials:"
 	@echo ""
@@ -37,7 +37,6 @@ DOCKER_IMAGE_TAG ?= latest
 ROBOTS_FILE ?= robots.txt.staging
 
 build:
-	@docker build -t offen/server:${DOCKER_IMAGE_TAG} -f build/server/Dockerfile .
 	@docker build --build-arg siteurl=${SITEURL} --build-arg robots=${ROBOTS_FILE} -t offen/proxy:${DOCKER_IMAGE_TAG} -f build/proxy/Dockerfile .
 
 .PHONY: setup build bootstrap build secret
diff --git a/bootstrap.yml b/bootstrap.yml
new file mode 100644
index 0000000..c1193d5
--- /dev/null
+++ b/bootstrap.yml
@@ -0,0 +1,12 @@
+account_users:
+  - email: develop@offen.dev
+    password: develop
+    accounts:
+      - 9b63c4d8-65c0-438c-9d30-cc4b01173393
+      - 78403940-ae4f-4aff-a395-1e90f145cf62
+
+accounts:
+  - name: offen.dev
+    id: 9b63c4d8-65c0-438c-9d30-cc4b01173393
+  - name: Other
+    id: 78403940-ae4f-4aff-a395-1e90f145cf62
diff --git a/docker-compose.yml b/docker-compose.yml
index d906c68..8f2c248 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,9 @@ services:
 
   server:
     image: offen/server:latest
+    command: serve
+    volumes:
+      - ./bootstrap.yml:/bootstrap.yml
     environment:
       POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable
       PORT: 8080
diff --git a/nginx.conf b/nginx.conf
index f7462f5..6203cc3 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -50,11 +50,26 @@ http {
 			proxy_redirect off;
 		}
 
+		location /normalize.css {
+			proxy_pass http://server;
+			proxy_redirect off;
+		}
+
+		location /skeleton.css {
+			proxy_pass http://server;
+			proxy_redirect off;
+		}
+
 		location /healthz {
 			proxy_pass http://server;
 			proxy_redirect off;
 		}
 
+		location /versionz {
+			proxy_pass http://server;
+			proxy_redirect off;
+		}
+
 		location /favicon.ico {
 			root /www/data/theme/images;
 		}