ci: Finish up work on CI setup.

.circleci/config.yml

@@ -129,6 +129,7 @@ jobs:
 workflows:
   version: 2
   scheduled-docker-build:
+    # TODO: Change CI over to dorianpula/rookeries:freebsd-build-latest and build-latest after successful builds.
     jobs:
       - docker/publish:
           name: docker-linux-build-image
@@ -136,7 +137,7 @@ workflows:
           docker-username: DOCKER_USER
           docker-password: DOCKER_PASS
           tag: latest
-          cache_from: "dorianpula/rookeries-build:latest"
+          cache_from: "dorianpula/rookeries:build-latest"
           extra_build_args: "--target BUILD"
 
       - docker/publish:
@@ -146,7 +147,7 @@ workflows:
           docker-password: DOCKER_PASS
           tag: freebsd-latest
           path: freebsd-builder
-          cache_from: "dorianpula/rookeries-build:freebsd-latest"
+          cache_from: "dorianpula/rookeries:freebsd-build-latest"
 
     triggers:
       - schedule:
@@ -159,14 +160,6 @@ workflows:
   build-test-publish:
     jobs:
       - build-rookeries
-      - docker/publish:
-          name: docker-freebsd-build-image-temp
-          image: dorianpula/rookeries-build
-          docker-username: DOCKER_USER
-          docker-password: DOCKER_PASS
-          tag: freebsd-latest
-          path: freebsd-builder
-          cache_from: "dorianpula/rookeries-build:freebsd-latest"
 
       - test-site-generator:
           requires:
@@ -190,7 +183,6 @@ workflows:
             - test-plugins
       - publish-freebsd:
           requires:
-            - docker-freebsd-build-image-temp
             - test-site-generator
             - test-site-app
             - test-plugins