Merge branch 'prod'

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "etc/common/devops-helpers"]
-	path = etc/common/devops-helpers
-	url = https://github.com/fpco/devops-helpers.git

etc/build_deploy.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# See description at https://github.com/fpco/devops-helpers#wrappers
-set -xe
-cd "$(dirname "${BASH_SOURCE[0]}")/.."
-ENV="$1"; shift
-stack --docker --docker-auto-pull test "$@"
-etc/docker/build.sh --docker --no-build "$@"
-etc/docker/push.sh "$ENV"
-etc/kubernetes/deploy_rc.sh "$ENV"

etc/common/devops-helpers

@@ -1 +0,0 @@
-Subproject commit 0625e1af76d2b64a428bf2b0b9d8d6a857cf8a6a

etc/docker/.gitignore

@@ -0,0 +1 @@
+/_artifacts/

etc/docker/Dockerfile

@@ -0,0 +1,6 @@
+#fpco/stack-run:lts-5
+FROM fpco/stack-run@sha256:4b170ac899755a89c0295b7726c5530015211055125f6e3f6c5b902cb3e9b74b
+COPY _artifacts/config/ /app/config/
+COPY _artifacts/static/ /app/static/
+COPY _artifacts/stackage-server /usr/local/bin/stackage-server
+COPY _artifacts/stackage-server-cron /usr/local/bin/stackage-server-cron

etc/docker/build.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# See description at https://github.com/fpco/devops-helpers#wrappers
-set -xe
-cd "$(dirname "${BASH_SOURCE[0]}")/../.."
-stack image container "$@"

etc/docker/push.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-# See description at https://github.com/fpco/devops-helpers#wrappers
-set -xe
-exec "$(dirname "${BASH_SOURCE[0]}")/../common/devops-helpers/docker/push_helper.sh" \
-    --repo fpco/stackage-server "$@"

etc/kubernetes/deploy_rc.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# See description at https://github.com/fpco/devops-helpers#wrappers
-set -xe
-exec "$(dirname ${BASH_SOURCE[0]})/../common/devops-helpers/kubernetes/deploy_rc_helper.sh" \
-     --app "stackage-server" \
-     --repo fpco/stackage-server \
-     --specdir "$(dirname "${BASH_SOURCE[0]}")" \
-     "$@"

etc/kubernetes/stackage-server-prod-rc.yaml

@@ -1,26 +0,0 @@
-# Kubernetes
----
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: stackage-server-prod-v0
-spec:
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: stackage-server-prod
-        version: v0
-    spec:
-      containers:
-      - name: stackage-server
-        image: fpco/stackage-server:prod
-        imagePullPolicy: Always
-        ports:
-        - name: http
-          containerPort: 3000
-        command: ["stackage-server"]
-        workingDir: /app
-        env:
-        - name: APPROOT
-          value: "https://www.stackage.org"

etc/kubernetes/stackage-server-prod-svc.yaml

@@ -1,19 +0,0 @@
-# Kubernetes
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: stackage-server-prod
-  labels:
-    app: stackage-server-prod
-spec:
-  ports:
-  - name: http
-    port: 80
-    targetPort: http
-  - name: https
-    port: 443
-    targetPort: http
-  type: ClusterIP
-  selector:
-    app: stackage-server-prod

etc/scripts/stage_docker.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname "${BASH_SOURCE[0]}")/../.."
+mkdir -p etc/docker/_artifacts
+stack install --local-bin-path=etc/docker/_artifacts "$@"
+cp -r config static etc/docker/_artifacts/

stack.yaml

@@ -5,13 +5,6 @@ packages:
     git: https://github.com/snoyberg/hoogle.git
     commit: 765bd653d687e8569cd989be1637de86dcb20d56
   extra-dep: true
-image:
-    container:
-        name: fpco/stackage-server
-        base: fpco/stack-run:lts-5
-        add:
-            config: /app/config
-            static: /app/static
 extra-deps:
     - prometheus-client-0.1.0.1
     - prometheus-metrics-ghc-0.1.0.1