From b9f20d8ae8a9279866f54ca0d67c72a5d33db6e8 Mon Sep 17 00:00:00 2001
From: Nick Santos <nicholas.j.santos@gmail.com>
Date: Wed, 10 Apr 2019 13:51:43 -0400
Subject: [PATCH] convert Tiltfile to new liveupdate (#99)

---
 Dockerfile      |  9 ---------
 Tiltfile        | 27 ++++++++++++++-------------
 base.dockerfile |  5 -----
 docs.dockerfile | 10 ++++++++++
 serve.yaml      |  4 ++--
 site.dockerfile | 10 ++++++++++
 6 files changed, 36 insertions(+), 29 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 base.dockerfile
 create mode 100644 site.dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index e5772a7b..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ruby:2.6
-
-RUN gem install jekyll bundler
-
-WORKDIR /src
-
-ADD src .
-
-RUN bundle update
diff --git a/Tiltfile b/Tiltfile
index 16cfdec5..6078b9a8 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -1,25 +1,26 @@
 # -*- mode: Python -*-
 
+default_registry('gcr.io/windmill-public-containers')
+
 # Generate the API docs.
 read_file('api/api.py')
 local('make api')
 
 k8s_yaml('serve.yaml')
 
-img = fast_build('gcr.io/windmill-public-containers/tilt-site',
-                 'base.dockerfile',
-                 'bundle exec jekyll serve --config _config.yml,_config-dev.yml')
-img.add('./src', '/src/')
-img.run('bundle install', trigger=['src/Gemfile', 'src/Gemfile.lock'])
-img.hot_reload()
+docker_build('tilt-site', 'src', dockerfile='site.dockerfile',
+             live_update = [
+               sync('./src', '/src/'),
+               run('bundle install', trigger=['src/Gemfile', 'src/Gemfile.lock'])
+             ])
 
-img = fast_build('gcr.io/windmill-public-containers/docs-site',
-                 'docs.dockerfile',
-                 'bundle exec jekyll serve --config _config.yml,_config-dev.yml')
-img.add('./src', '/src/')
-img.add('./docs', '/docs/')
-img.run('bundle install', trigger=['src/Gemfile', 'src/Gemfile.lock', 'docs/Gemfile', 'docs/Gemfile.lock'])
-img.hot_reload()
+docker_build('docs-site', '.', dockerfile='docs.dockerfile',
+             live_update = [
+               sync('./src', '/src/'),
+               sync('./docs', '/docs/'),
+               run('bundle install', trigger=['src/Gemfile', 'src/Gemfile.lock',
+                                              'docs/Gemfile', 'docs/Gemfile.lock'])
+             ])
 
 k8s_resource('tilt-site', port_forwards=4000)
 k8s_resource('docs-site', port_forwards=4001)
diff --git a/base.dockerfile b/base.dockerfile
deleted file mode 100644
index 3bced91a..00000000
--- a/base.dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM ruby:2.6
-
-RUN gem install jekyll bundler
-
-WORKDIR /src
diff --git a/docs.dockerfile b/docs.dockerfile
index 46e65a38..a64b9560 100644
--- a/docs.dockerfile
+++ b/docs.dockerfile
@@ -3,3 +3,13 @@ FROM ruby:2.6
 RUN gem install jekyll bundler
 
 WORKDIR /docs
+
+RUN mkdir -p /src
+RUN mkdir -p /docs
+ADD src/Gemfile* /src/
+ADD docs/Gemfile* /docs/
+
+RUN bundle install
+ADD src /src/
+ADD docs /docs/
+ENTRYPOINT bundle exec jekyll serve --config _config.yml,_config-dev.yml
diff --git a/serve.yaml b/serve.yaml
index 9c9f7e11..d156130b 100644
--- a/serve.yaml
+++ b/serve.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: tilt-site
-        image: gcr.io/windmill-public-containers/tilt-site
+        image: tilt-site
         ports:
         - containerPort: 4000
 ---
@@ -32,6 +32,6 @@ spec:
     spec:
       containers:
       - name: docs-site
-        image: gcr.io/windmill-public-containers/docs-site
+        image: docs-site
         ports:
         - containerPort: 4000
diff --git a/site.dockerfile b/site.dockerfile
new file mode 100644
index 00000000..fe9b7a3d
--- /dev/null
+++ b/site.dockerfile
@@ -0,0 +1,10 @@
+FROM ruby:2.6
+
+RUN gem install jekyll bundler
+
+WORKDIR /src
+
+ADD ./Gemfile* /src/
+RUN bundle install
+ADD . .
+ENTRYPOINT bundle exec jekyll serve --config _config.yml,_config-dev.yml