ci: switch to jib for image building

Author: TimoKramer

.circleci/config.yml

@@ -2,7 +2,6 @@ version: 2.1
 
 orbs:
   tools: replikativ/clj-tools@0
-  docker: circleci/docker@2.0.1
 
 jobs:
   build:
@@ -12,31 +11,33 @@ jobs:
           at: /home/circleci
       - run:
           name: Build
-          command: clojure -T:build uber
+          command: clojure -Sthreads 1 -T:build uber
           no_output_timeout: 5m
       - persist_to_workspace:
           root: /home/circleci/
           paths:
             - replikativ/target
   deploy:
-    executor: docker/docker
+    executor: tools/clojurecli
     steps:
-      - setup_remote_docker
       - attach_workspace:
           at: /home/circleci
-      - docker/check
       - run:
-          name: Build datahike-server container image
+          name: Deploy to Docker Hub
           command: |
-            cd /home/circleci/replikativ
-            VERSION=$(git rev-list HEAD --count)
-            docker build -t replikativ/datahike-server:${VERSION} .
+            clojure -Sthreads 1 \
+                    -T:build deploy-image \
+                    :docker-login ${DOCKER_LOGIN} \
+                    :docker-password ${DOCKER_PASSWORD} \
+          no_output_timeout: 5m
+  release:
+    executor: tools/clojurecli
+    steps:
+      - attach_workspace:
+          at: /home/circleci
       - run:
-          name: Deploy Snapshot to Docker Hub
-          command: |
-            cd /home/circleci/replikativ
-            VERSION=$(git rev-list HEAD --count)
-            docker push replikativ/datahike-server:${VERSION}
+          name: Release
+          command: clojure -Sthreads 1 -T:build release
 
 workflows:
   build-test-and-deploy:
@@ -62,7 +63,6 @@ workflows:
             - tools/setup
       - deploy:
           context:
-            - clojars-deploy
             - dockerhub-deploy
           filters:
             branches:
@@ -73,3 +73,12 @@ workflows:
             - tools/unittest
             - tools/integrationtest
             - build
+      - release:
+          context:
+            - dockerhub-deploy
+            - github-token
+          filters:
+            branches:
+              only: main
+          requires:
+            - deploy

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java:17
+FROM gcr.io/distroless/java17-debian11
 
 COPY target/datahike-server-*-standalone.jar /
 

build.clj

@@ -2,15 +2,25 @@
   (:require
     [borkdude.gh-release-artifact :as gh]
     [clojure.tools.build.api :as b]
-    [deps-deploy.deps-deploy :as dd]))
+    [deps-deploy.deps-deploy :as dd])
+  (:import
+    [java.nio.file Paths]
+    [com.google.cloud.tools.jib.api Jib Containerizer RegistryImage TarImage]
+    [com.google.cloud.tools.jib.api.buildplan AbsoluteUnixPath Port]))
 
 (def lib 'io.replikativ/datahike-server)
 (def version (format "0.1.%s" (b/git-count-revs nil)))
 (def current-commit (gh/current-commit))
 (def class-dir "target/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
-(def jar-file (format "target/%s-%s.jar" (name lib) version))
-(def uber-file (format "target/%s-%s-standalone.jar" (name lib) version))
+(def jar-path (format "target/%s-%s.jar" (name lib) version))
+(def uber-file (format "%s-%s-standalone.jar" (name lib) version))
+(def uber-path (format "target/%s" uber-file))
+(def image (format "docker.io/replikativ/datahike-server:%s" version))
+
+(defn get-version
+  [_]
+  (println version))
 
 (defn clean
   [_]
@@ -35,7 +45,7 @@
   (b/copy-dir {:src-dirs ["src" "resources"]
                :target-dir class-dir})
   (b/jar {:class-dir class-dir
-          :jar-file jar-file}))
+          :jar-file jar-path}))
 
 (defn uber
   [_]
@@ -46,14 +56,14 @@
                   :src-dirs ["src"]
                   :class-dir class-dir})
   (b/uber {:class-dir class-dir
-           :uber-file uber-file
+           :uber-file uber-path
            :basis basis
            :main 'datahike-server.core}))
 
 (defn deploy
   "Don't forget to set CLOJARS_USERNAME and CLOJARS_PASSWORD env vars."
   [_]
-  (dd/deploy {:installer :remote :artifact jar-file
+  (dd/deploy {:installer :remote :artifact jar-path
               :pom-file (b/pom-path {:lib lib :class-dir class-dir})}))
 
 (defn release
@@ -62,7 +72,7 @@
                            :repo (name lib)
                            :tag version
                            :commit current-commit
-                           :file jar-file
+                           :file uber-path
                            :content-type "application/java-archive"})
       :url
       println))
@@ -74,19 +84,34 @@
   (b/install {:basis (b/create-basis {})
               :lib lib
               :version version
-              :jar-file jar-file
+              :jar-file jar-path
               :class-dir class-dir}))
 
+(defn deploy-image
+  [{:keys [docker-login docker-password]}]
+  (if-not (and docker-login docker-password)
+    (println "Docker credentials missing.")
+    (.containerize
+      (-> (Jib/from "gcr.io/distroless/java17-debian11")
+          (.addLayer [(Paths/get uber-path (into-array String[]))] (AbsoluteUnixPath/get "/"))
+          (.setProgramArguments [(format "/%s" uber-file)])
+          (.addExposedPort (Port/tcp 3000)))
+      (Containerizer/to
+        (-> (RegistryImage/named image)
+            (.addCredential (str docker-login) (str docker-password))))))
+  (println "Deployed new image to Docker Hub: " image))
+
 (comment
+  (def docker-login "")
+  (def docker-password "")
+
   (b/pom-path {:lib lib :class-dir class-dir})
   (clean nil)
   (compile nil)
   (jar nil)
+  (uber nil)
+  (deploy-image {:docker-login docker-login
+                 :docker-password docker-password})
   (deploy nil)
   (release nil)
-  (install nil)
-
-  (name lib)
-  (namespace lib)
-  (require '[babashka.fs :as fs])
-  (fs/file-name (format "target/datahike-%s.jar" version)))
+  (install nil))

deps.edn

@@ -30,6 +30,6 @@
                                                         :sha "2f8898d84126a4e922c490f8614211a8b0cf67cd"}
                           babashka/babashka.curl {:mvn/version "0.1.1"}
                           babashka/fs {:mvn/version "0.1.2"}
-                          cheshire/cheshire {:mvn/version "5.10.1"}}
+                          cheshire/cheshire {:mvn/version "5.10.1"}
+                          com.google.cloud.tools/jib-core {:mvn/version "0.20.0"}}
                    :ns-default build}}}
-