From 74bd9615025370b6a9cd91f0bf3d76f1121681b0 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sat, 25 Jan 2020 14:38:41 -0500
Subject: [PATCH] add package.dhall files

---
 Dockerfile          |  4 ++--
 drone/package.dhall |  5 +++++
 k8s/allApps.dhall   |  5 +++++
 k8s/package.dhall   | 11 +++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 drone/package.dhall
 create mode 100644 k8s/allApps.dhall
 create mode 100644 k8s/package.dhall

diff --git a/Dockerfile b/Dockerfile
index 898ee5b..7d2391a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM xena/alpine
 COPY --from=dyaml /bin/dhall-to-yaml-ng /usr/local/bin/dhall-to-yaml
 WORKDIR /drone
 COPY ./drone .
-RUN dhall-to-yaml --file pipeline.dhall
+RUN dhall-to-yaml --omit-empty --file pipeline.dhall
 WORKDIR /k8s
 COPY ./k8s .
-RUN cd apps && dhall-to-yaml --file hlang.dhall
+RUN dhall-to-yaml --omit-empty --documents --file allApps.dhall
diff --git a/drone/package.dhall b/drone/package.dhall
new file mode 100644
index 0000000..0d87021
--- /dev/null
+++ b/drone/package.dhall
@@ -0,0 +1,5 @@
+{ dockerBuild = ./common/dockerBuild.dhall
+, dockerHost = ./common/dockerHost.dhall
+, goStep = ./common/go.dhall
+, types = ./types.dhall
+}
diff --git a/k8s/allApps.dhall b/k8s/allApps.dhall
new file mode 100644
index 0000000..8a068a9
--- /dev/null
+++ b/k8s/allApps.dhall
@@ -0,0 +1,5 @@
+[ ./apps/hlang.dhall
+, ./apps/olin.dhall
+, ./apps/tulpaforce.xyz.dhall
+, ./apps/within.website.dhall
+]
diff --git a/k8s/package.dhall b/k8s/package.dhall
new file mode 100644
index 0000000..9e80e63
--- /dev/null
+++ b/k8s/package.dhall
@@ -0,0 +1,11 @@
+{ app =
+    { Config = ./app/config.dhall
+    , K8sList = ./app/list.dhall
+    , make = ./app/make.dhall
+    }
+, http =
+    { deployment = ./http/deployment.dhall
+    , ingress = ./http/ingress.dhall
+    , service = ./http/service.dhall
+    }
+}