jekyll: update how files are generated (#1170)

Signed-off-by: Nick Santos <[email protected]>

Author: nicks

.github/workflows/deploy.yaml

@@ -18,15 +18,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2.0
-          bundler-cache: true
-      - name: Install dependencies
-        run: |
-          bundle install
-
       - name: Check for changes
         id: paths
         uses: dorny/paths-filter@v2
@@ -53,14 +44,14 @@ jobs:
           role-to-assume: arn:aws:iam::710015040892:role/prod-collaboration-blog.tilt.dev-20250228142654978300000003
           aws-region: us-east-1
 
-      - name: Create website blog.tilt.dev
+      - name: Build blog static site
         if: steps.paths.outputs.blog == 'true'
         run: |
-          JEKYLL_ENV=production bundle exec jekyll build -s blog -d blog/_site
+          make build-blog
       - name: Deploy website blog.tilt.dev
         if: steps.paths.outputs.blog == 'true'
         run: |
-          aws s3 sync blog/_site s3://prod-collaboration-blog.tilt.dev/ --region us-east-1 --delete
+          aws s3 sync build/blog s3://prod-collaboration-blog.tilt.dev/ --region us-east-1 --delete
       - name: Invalidate CloudFront cache for blog.tilt.dev
         if: steps.paths.outputs.blog == 'true'
         run: |
@@ -73,14 +64,14 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::710015040892:role/prod-collaboration-docs.tilt.dev-20250228142654979400000004
           aws-region: us-east-1
-      - name: Create website docs.tilt.dev
+      - name: Build docs static site
         if: steps.paths.outputs.docs == 'true'
         run: |
-          JEKYLL_ENV=production bundle exec jekyll build -s docs -d docs/_site
+          make build-docs
       - name: Deploy website docs.tilt.dev
         if: steps.paths.outputs.docs == 'true'
         run: |
-          aws s3 sync docs/_site s3://prod-collaboration-docs.tilt.dev/ --region us-east-1 --delete
+          aws s3 sync build/docs s3://prod-collaboration-docs.tilt.dev/ --region us-east-1 --delete
       - name: Invalidate CloudFront cache for docs.tilt.dev
         if: steps.paths.outputs.docs == 'true'
         run: |
@@ -93,14 +84,14 @@ jobs:
         with:
           role-to-assume: arn:aws:iam::710015040892:role/prod-collaboration-tilt.dev-20250228142654974200000002
           aws-region: us-east-1
-      - name: Create website www.tilt.dev
+      - name: Build site static site
         if: steps.paths.outputs.site == 'true'
         run: |
-          JEKYLL_ENV=production bundle exec jekyll build -s src -d src/_site
+          make build-site
       - name: Deploy website www.tilt.dev
         if: steps.paths.outputs.site == 'true'
         run: |
-          aws s3 sync src/_site s3://prod-collaboration-tilt.dev/ --region us-east-1 --delete
+          aws s3 sync build/site s3://prod-collaboration-tilt.dev/ --region us-east-1 --delete
       - name: Invalidate CloudFront cache for www.tilt.dev
         if: steps.paths.outputs.site == 'true'
         run: |

.gitignore

@@ -55,3 +55,7 @@ build-iPhoneSimulator/
 tilt_modules
 
 .DS_Store
+.aider*
+
+# Ignore _site subdirectories
+build

Makefile

@@ -1,4 +1,4 @@
-.PHONY: api stars cli-toc
+.PHONY: api stars cli-toc build-blog build-docs build-site
 
 api:
 	docker rm tilt.api || exit 0
@@ -18,3 +18,18 @@ stars:
 
 cli-toc:
 	./hack/inject_cli_toc.sh
+
+build-blog:
+	rm -fR build/blog
+	docker build -t tilt-site-base -f deploy/base.dockerfile .
+	docker buildx build --target static --output type=local,dest=build/blog -f deploy/blog.dockerfile .
+
+build-docs:
+	rm -fR build/docs
+	docker build -t tilt-site-base -f deploy/base.dockerfile .
+	docker buildx build --target static --output type=local,dest=build/docs -f deploy/docs.dockerfile .
+
+build-site:
+	rm -fR build/site
+	docker build -t tilt-site-base -f deploy/base.dockerfile .
+	docker buildx build --target static --output type=local,dest=build/site -f deploy/site.dockerfile .

deploy/base.dockerfile

@@ -14,3 +14,5 @@ WORKDIR /src
 ADD ./src/Gemfile /src/
 ADD ./src/Gemfile.lock /src/
 RUN bundle install
+
+ENTRYPOINT ["jekyll"]

deploy/blog.dockerfile

@@ -1,9 +1,17 @@
-FROM tilt-site-base
+FROM tilt-site-base AS sources
 
 WORKDIR /blog
 
 RUN mkdir -p /blog
 ADD src /src/
 ADD blog /blog/
 ADD healthcheck.sh .
-ENTRYPOINT bundle exec jekyll serve --trace --future --config _config.yml,_config-dev.yml
+
+FROM sources AS static-builder
+RUN JEKYLL_ENV=production bundle exec jekyll build -d _site
+
+FROM scratch AS static
+COPY --from=static-builder /blog/_site /
+
+FROM sources
+ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--trace", "--future", "--config", "_config.yml,_config-dev.yml"]

deploy/docs.dockerfile

@@ -1,9 +1,17 @@
-FROM tilt-site-base
+FROM tilt-site-base AS sources
 
 WORKDIR /docs
 
 RUN mkdir -p /docs
 ADD src /src/
 ADD docs /docs/
 ADD healthcheck.sh .
-ENTRYPOINT bundle exec jekyll serve --trace --config _config.yml,_config-dev.yml
+
+FROM sources AS static-builder
+RUN JEKYLL_ENV=production bundle exec jekyll build -d _site
+
+FROM scratch AS static
+COPY --from=static-builder /docs/_site /
+
+FROM sources
+ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--trace", "--config", "_config.yml,_config-dev.yml"]

deploy/site.dockerfile

@@ -1,4 +1,16 @@
-FROM tilt-site-base
-ADD ./src .
+FROM tilt-site-base AS sources
+
+WORKDIR /src
+
+RUN mkdir -p /src
+ADD src /src/
 ADD healthcheck.sh .
-ENTRYPOINT bundle exec jekyll serve --trace --config _config.yml,_config-dev.yml
+
+FROM sources AS static-builder
+RUN JEKYLL_ENV=production bundle exec jekyll build -d _site
+
+FROM scratch AS static
+COPY --from=static-builder /src/_site /
+
+FROM sources
+ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "--trace", "--config", "_config.yml,_config-dev.yml"]