2
0
mirror of https://github.com/offen/website.git synced 2024-11-22 01:00:26 +01:00

consume latest server build

This commit is contained in:
Frederik Ring 2019-10-09 20:34:31 +02:00
parent 71bbe31875
commit 76cf23ef97
4 changed files with 31 additions and 2 deletions

View File

@ -21,7 +21,7 @@ howto:
bootstrap: bootstrap:
@echo "Bootstrapping Server service ..." @echo "Bootstrapping Server service ..."
@docker-compose run server make bootstrap @docker-compose run server bootstrap
@echo "" @echo ""
@echo "You can now log into the development backend using the following credentials:" @echo "You can now log into the development backend using the following credentials:"
@echo "" @echo ""
@ -37,7 +37,6 @@ DOCKER_IMAGE_TAG ?= latest
ROBOTS_FILE ?= robots.txt.staging ROBOTS_FILE ?= robots.txt.staging
build: 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 . @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 .PHONY: setup build bootstrap build secret

12
bootstrap.yml Normal file
View File

@ -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

View File

@ -13,6 +13,9 @@ services:
server: server:
image: offen/server:latest image: offen/server:latest
command: serve
volumes:
- ./bootstrap.yml:/bootstrap.yml
environment: environment:
POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable
PORT: 8080 PORT: 8080

View File

@ -50,11 +50,26 @@ http {
proxy_redirect off; 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 { location /healthz {
proxy_pass http://server; proxy_pass http://server;
proxy_redirect off; proxy_redirect off;
} }
location /versionz {
proxy_pass http://server;
proxy_redirect off;
}
location /favicon.ico { location /favicon.ico {
root /www/data/theme/images; root /www/data/theme/images;
} }