fix up travis

Author: Matthew

.travis.yml

@@ -8,11 +8,11 @@ branches:
 services:
   - docker
 install:
-  - make build
+  - make docker-build
 script:
   - make test
 deploy:
   provider: script
-  script: contrib/ci/deploy.sh
+  script: _scripts/ci/deploy.sh
   on:
     branch: master

Makefile

@@ -1,31 +1,60 @@
 include includes.mk
 
-# Short name, following [a-zA-Z_], used all over the place.
-SHORT_NAME := postgres
+# Short name: Short name, following [a-zA-Z_], used all over the place.
+# Some uses for short name:
+# - Docker image name
+# - Kubernetes service, rc, pod, secret, volume names
+SHORT_NAME := database
 
 # SemVer with build information is defined in the SemVer 2 spec, but Docker
 # doesn't allow +, so we use -.
-VERSION := 0.0.1-$(shell date "+%Y%m%d%H%M%S")
+VERSION := 0.1.0-$(shell date "+%Y%m%d%H%M%S")
 
 # Legacy support for DEV_REGISTRY, plus new support for DEIS_REGISTRY.
 DEIS_REGISTRY ?= ${DEV_REGISTRY}
 
 IMAGE_PREFIX ?= deis/
 
+# Kubernetes-specific information for RC, Service, and Image.
+RC := manifests/deis-${SHORT_NAME}-rc.tmp.yaml
+SVC := manifests/deis-${SHORT_NAME}-service.yaml
 IMAGE := ${DEIS_REGISTRY}/${IMAGE_PREFIX}${SHORT_NAME}:${VERSION}
 
 all:
 	@echo "Use a Makefile to control top-level building of the project."
 
-build: docker-build
+build:
+	@echo "Nothing to build. Use 'make docker-build' to build the image."
 
+# For cases where we're building from local
+# We also alter the RC file to set the image name.
 docker-build: check-docker
 	docker build --rm -t ${IMAGE} rootfs
 
+# Push to a registry that Kubernetes can access.
 docker-push: check-docker check-registry
 	docker push ${IMAGE}
 
-test:
-	@echo "No tests"
+# Deploy is a Kubernetes-oriented target
+deploy: kube-service kube-rc
 
-.PHONY: all build
+# Some things, like services, have to be deployed before pods. This is an
+# example target. Others could perhaps include kube-secret, kube-volume, etc.
+kube-service: check-kubectl
+	kubectl create -f ${SVC}
+
+# When possible, we deploy with RCs.
+kube-rc: check-kubectl
+	kubectl create -f ${RC}
+
+kube-clean: check-kubectl
+	kubectl delete rc deis-example
+
+test: check-docker
+	./_scripts/ci/test.sh ${IMAGE}
+
+update-manifests:
+	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-database-rc.yaml \
+		> manifests/deis-database-rc.tmp.yaml
+
+.PHONY: all build kube-up kube-down deploy

README.md

@@ -1,4 +1,4 @@
-# Postgres
+# Deis Database
 
 A PostgreSQL database for use in the [Deis](http://deis.io) open source PaaS.
 

contrib/ci/deploy.sh _scripts/ci/deploy.shcontrib/ci/deploy.sh renamed to _scripts/ci/deploy.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eof pipefail
+set -x
+
+JOB=$(docker run -d $1)
+# wait for postgres to boot
+sleep 4
+docker exec $JOB is_master
+docker rm -f $JOB

_scripts/ci/test.sh

@@ -12,5 +12,6 @@ check-kubectl:
 
 check-registry:
 	@if [ -z "$$DEIS_REGISTRY" ] && [ -z "$$DEV_REGISTRY" ]; then \
-	  echo "DEIS_REGISTRY is not exported"; \
-	exit 2; \
+		echo "DEIS_REGISTRY is not exported"; \
+		exit 2; \
+	fi

includes.mk

@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: deis-database
+  labels:
+    app: deis-database
+    heritage: deis
+spec:
+  replicas: 1
+  selector:
+    app: deis-database
+    heritage: deis
+  template:
+    metadata:
+      labels:
+        app: deis-database
+        heritage: deis
+    spec:
+      containers:
+        - name: deis-database
+          image: quay.io/deisci/database:v2-alpha
+          env:
+            - name: POSTGRES_USER
+              value: "deis"
+            - name: POSTGRES_PASSWORD
+              value: "changeme123"
+          ports:
+            - containerPort: 5432
+          readinessProbe:
+            exec:
+              command:
+                - is_master

manifests/deis-database-rc.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: deis-database
+  labels:
+    heritage: deis
+spec:
+  ports:
+    - port: 5432
+  selector:
+    name: deis-database
+    heritage: deis

manifests/deis-database-service.yaml

@@ -13,22 +13,11 @@ RUN apt-get update && apt-get install -y \
     --no-install-recommends \
     && rm -rf /var/cache/apt/*
 
-# add backup dir
-RUN mkdir -p /var/cache/postgresql/backups
-RUN chown -R postgres:postgres /var/cache/postgresql/backups
-
 COPY . /
-
-RUN chown -R postgres:postgres /app
-
 WORKDIR /app
 
-RUN pip install -r requirements.txt
+ENV PGDATA /app/data
 
-USER postgres
-
-RUN mkdir data
-
-CMD ["python", "governor.py", "postgres.yml"]
+RUN pip install -r requirements.txt
 
 ENV DEIS_RELEASE 2.0.0-dev

rootfs/Dockerfile

@@ -4,9 +4,9 @@
 set -e
 
 # check if database is running
-pg_ctl status -D /app/data
+gosu postgres pg_ctl status -D $PGDATA
 
-QUERY=$(psql -Atc 'SELECT pg_is_in_recovery()')
+QUERY=$(gosu postgres psql -Atc 'SELECT pg_is_in_recovery()')
 
 if [ "$QUERY" == "f" ]; then
     exit 0