Update GHA versions (#80)

* actions/setup-java@v4
* actions/cache@v4
* actions/checkout@v4

.github/actions/setup-build/action.yml

@@ -0,0 +1,18 @@
+name: Set up Build
+description: Sets up Build
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v4
+      with:
+        java-version: '8'
+        distribution: temurin
+    - name: Cache dependencies
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-lein-${{ hashFiles('**/project.clj') }}
+        restore-keys: ${{ runner.os }}-lein-
+    - name: Clear existing docker image cache
+      shell: bash
+      run: docker image prune -af

.github/workflows/clojure.yml

@@ -2,17 +2,20 @@ name: Clojure CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
+
+permissions:
+  contents: read
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - name: Setup Build
+        uses: ./.github/actions/setup-build
       - name: Install dependencies
         run: lein deps
       - name: Run tests

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Build
+        uses: ./.github/actions/setup-build
+      - name: Set version
+        run: |
+          lein change version set '"${{github.event.release.tag_name}}"'
+      - name: Release ${{github.event.release.tag_name}}
+        run: lein with-profile release deploy maven
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

CHANGELOG.md

@@ -1,6 +1,32 @@
 # Change Log
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
+## [0.7.4] - 2022-11-16
+### Changed
+- [#64](https://github.com/javahippie/clj-test-containers/pull/64): Fix container path parameter for copy-file-to-container! in README
+- [#65](https://github.com/javahippie/clj-test-containers/issues/65): Upgrade to testcontainers-java 1.17.6
+- [#66](https://github.com/javahippie/clj-test-containers/issues/66): Remove usage of deprecated API calls for cleanup
+- [#67](https://github.com/javahippie/clj-test-containers/issues/67): Update Dependencies
+
+## [0.7.3] - 2202-09-30
+### Changed
+- [#63](https://github.com/javahippie/clj-test-containers/issues/63): Upgrade to testcontainers-java 1.17.4
+
+## [0.7.2] - 2202-07-03
+### Changed
+- [#61](https://github.com/javahippie/clj-test-containers/issues/61): Upgrade to testcontainers-java 1.17.3
+
+## [0.7.1] - 2202-06-12
+### Added
+- [#58](https://github.com/javahippie/clj-test-containers/issues/58): Add new `allowInsecure` flag to the HTTP wait strategy
+
+### Changed
+- [#57](https://github.com/javahippie/clj-test-containers/issues/57): Upgrade to testcontainers-java 1.17.2
+
+## [0.7.0] - 2022-04-23
+### Changed
+- [#56](https://github.com/javahippie/clj-test-containers/issues/56): Update to Testcontainers 1.17.1
+
 ## [0.6.0] - 2022-03-26
 ### Changed
 - [#55](https://github.com/javahippie/clj-test-containers/issues/55): Upgrade to latest Testcontainers version

README.md

@@ -346,7 +346,7 @@ Copies a file from your filesystem or classpath into the running container
 | `container-config`| Map, mandatory | Return value of the `create` function |
 | Second parameter: | | |
 | `:path`            | String, mandatory | Path to a classpath resource *or* file on your filesystem |
-| `:host-path`        | String, mandatory                | Path, to which the file should be copied |
+| `:container-path`        | String, mandatory                | Path, to which the file should be copied |
 | `:type`            | Keyword, mandatory                | `:classpath-resource` or `:host-path` |
 
 #### Result:

deps.edn

@@ -1,27 +1,27 @@
 {:paths   ["src" "resources"]
 
  :deps    {org.clojure/clojure               {:mvn/version "1.10.3"}
-           org.testcontainers/testcontainers {:mvn/version "1.16.3"}}
+           org.testcontainers/testcontainers {:mvn/version "1.19.7"}}
 
  :aliases {:dev         {:extra-paths "dev-src"}
            :test        {:extra-paths ["test" "test/resources"]
                          :extra-deps  {expound/expound               {:mvn/version "0.9.0"}
-                                       lambdaisland/kaocha           {:mvn/version "1.63.998"}
+                                       lambdaisland/kaocha           {:mvn/version "1.88.1376"}
-                                       lambdaisland/kaocha-cloverage {:mvn/version "1.0.75"}
+                                       lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
-                                       lambdaisland/kaocha-junit-xml {:mvn/version "0.0.76"}
+                                       lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"}
                                        org.clojure/test.check        {:mvn/version "1.1.1"}
-                                       org.testcontainers/postgresql {:mvn/version "1.16.3"}}}
+                                       org.testcontainers/postgresql {:mvn/version "1.19.7"}}}
 
            :test-runner {:extra-paths ["test" "test/resources"]
-                         :extra-deps  {expound/expound               {:mvn/version "0.8.5"}
+                         :extra-deps  {expound/expound               {:mvn/version "0.9.0"}
-                                       lambdaisland/kaocha           {:mvn/version "1.0.700"}
+                                       lambdaisland/kaocha           {:mvn/version "1.88.1376"}
-                                       lambdaisland/kaocha-cloverage {:mvn/version "1.0.63"}
+                                       lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
-                                       lambdaisland/kaocha-junit-xml {:mvn/version "0.0.76"}
+                                       lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"}
                                        org.clojure/test.check        {:mvn/version "1.1.1"}
                                        orchestra                     {:mvn/version "2021.01.01-1"}
-                                       org.testcontainers/postgresql {:mvn/version "1.16.3"}}
+                                       org.testcontainers/postgresql {:mvn/version "1.19.7"}}
                          :main-opts   ["-m" "kaocha.runner" "--reporter" "kaocha.report/documentation"]}
 
-           :cljstyle    {:extra-deps {mvxcvi/cljstyle {:mvn/version "0.15.0"
+           :cljstyle    {:extra-deps {mvxcvi/cljstyle {:mvn/version "0.16.630"
                                                        :exclusions  [org.clojure/clojure]}}
                          :main-opts  ["-m" "cljstyle.main" "check"]}}}

doc/log-strategies.md

@@ -4,13 +4,13 @@ This library offers two ways to access the logs of the running container: The :s
 
 ## String Strategy
 
-The `:string` strategy sets up a function in the returned map, under the `string-log` key. This function enables the
+The `:string` strategy sets up a function in the returned map, under the `:log` key. This function enables the
 dumping of the logs when passed to the `dump-logs` function.
 
 Example:
 
 ```clojure
-{:log-strategy :string}
+{:log-to {:log-strategy :string}}
 ```
 
 Then, later in your program, you can access the logs thus:
@@ -29,6 +29,6 @@ This way you can pass the container logging on to the logging library of your ch
 Example:
 
 ```clojure
-{:log-strategy :fn
+{:log-to {:log-strategy :fn
- :function     (fn [log-line] (println "From Container: " log-line)}
+          :function     (fn [log-line] (println "From Container: " log-line))}}
 ```

doc/tutorial.md

@@ -89,10 +89,10 @@ atom, a fixture for Testcontainers could look like this:
 
 ```clojure
 (use-fixtures :once (fn [f]
-                      (let [{pw       "apassword"
+                      (let [pw       "apassword"
                             postgres (tc/start! (tc/create {:image-name    "postgres:12.2"
                                                             :exposed-ports [5432]
-                                                             :env-vars      {"POSTGRES_PASSWORD" pw}}))}]
+                                                            :env-vars      {"POSTGRES_PASSWORD" pw}}))]
                         (my-app/initialize-db! {:dbtype   "postgresql"
                                                 :dbname   "postgres"
                                                 :user     "postgres"

doc/wait-strategies.md

@@ -18,6 +18,7 @@ criteria is met.
 | method            | String     | The HTTP method to use (get, post, put...)              |
 | status-codes      | seq of int | The status codes which mark a successful request        |
 | tls               | boolean    | Should TLS be used?                                     |
+| allow-insecure    | boolean    | Should insecure HTTP endpoints be trusted?              |
 | read-timeout      | long       | The duration in seconds the HTTP may take               |
 | basic-credentials | Map        | {:username "User" :password "Password"}                 |
 | headers           | Map        | HTTP Headers, e.g. {"Accept" "application/json"}        |

project.clj

@@ -1,13 +1,13 @@
-(defproject clj-test-containers "0.7.0"
+(defproject testcontainers-clj "unspecified"
-  :description "A lightweight, unofficial wrapper around the Testcontainers Java library"
+  :description "A lightweight, official wrapper around the Testcontainers Java library"
 
-  :url "https://github.com/javahippie/clj-test-containers"
+  :url "https://github.com/testcontainers/testcontainers-clj"
 
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
 
   :dependencies [[org.clojure/clojure "1.10.3"]
-                 [org.testcontainers/testcontainers "1.17.1"]]
+                 [org.testcontainers/testcontainers "1.19.7"]]
 
   :aliases {"test" ["run" "-m" "kaocha.runner"]
             "cljstyle" ["run" "-m" "cljstyle.main"]}
@@ -15,16 +15,20 @@
   :plugins [[jainsahab/lein-githooks "1.0.0"]]
 
   :profiles {:dev {:dependencies [[expound "0.9.0"]
-                                  [lambdaisland/kaocha "1.65.1029"]
+                                  [lambdaisland/kaocha "1.88.1376"]
-                                  [lambdaisland/kaocha-cloverage "1.0.75"]
+                                  [lambdaisland/kaocha-cloverage "1.1.89"]
-                                  [lambdaisland/kaocha-junit-xml "0.0.76"]
+                                  [lambdaisland/kaocha-junit-xml "1.17.101"]
-                                  [mvxcvi/cljstyle "0.15.0" :exclusions [org.clojure/clojure]]
+                                  [mvxcvi/cljstyle "0.16.630" :exclusions [org.clojure/clojure]]
                                   [org.clojure/test.check "1.1.1"]
                                   [orchestra "2021.01.01-1"]
-                                  [org.clojure/tools.namespace "1.2.0"]
+                                  [org.clojure/tools.namespace "1.5.0"]
-                                  [org.testcontainers/postgresql "1.16.3"]
+                                  [org.testcontainers/postgresql "1.19.7"]
-                                  [com.fzakaria/slf4j-timbre "0.3.21"]
+                                  [com.fzakaria/slf4j-timbre "0.4.1"]
-                                  [nrepl "0.9.0"]]
+                                  [nrepl "1.0.0"]]
-                   :source-paths ["dev-src"]}}
+                   :source-paths ["dev-src"]}
+             :release {:deploy-repositories [["maven" {:url           "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+                                                       :username      :env/ossrh_username
+                                                       :password      :env/ossrh_password
+                                                       :sign-releases false}]]}}
 
   :target-path "target/%s")

src/clj_test_containers/core.clj

@@ -8,6 +8,7 @@
       Paths)
     (java.time
       Duration)
+    (org.testcontainers DockerClientFactory)
     (org.testcontainers.containers
       BindMode
       GenericContainer
@@ -21,8 +22,7 @@
     (org.testcontainers.images.builder
       ImageFromDockerfile)
     (org.testcontainers.utility
-    MountableFile
+      MountableFile)))
-    ResourceReaper)))
 
 (defn- resolve-bind-mode
   (^BindMode [bind-mode]
@@ -30,9 +30,7 @@
      BindMode/READ_WRITE
      BindMode/READ_ONLY)))
 
-(defn- reaper-instance
+(defonce started-instances (atom #{}))
-  []
-  (ResourceReaper/instance))
 
 (defmulti wait
           "Sets a wait strategy to the container.  Supports :http, :health and :log as
@@ -102,6 +100,7 @@
            method
            status-codes
            tls
+           allow-insecure
            read-timeout
            basic-credentials
            headers
@@ -120,6 +119,9 @@
     (when tls
       (.usingTls for-http))
 
+    (when allow-insecure
+      (.allowInsecure for-http))
+
     (when read-timeout
       (.withReadTimeout for-http (Duration/ofSeconds read-timeout)))
 
@@ -332,7 +334,10 @@
 (defn dump-logs
   "Dumps the logs found by invoking the function on the :string-log key"
   [container-config]
-  ((:log container-config)))
+  (let [log-fn (:log container-config)]
+    (if (some? log-fn)
+      (log-fn)
+      (throw (IllegalStateException. "You are trying to access the container logs, but have not configured a log configuration with :log-to")))))
 
 (defn start!
   "Starts the underlying testcontainer instance and adds new values to the
@@ -348,9 +353,7 @@
         container-id ^String (.getContainerId container)
         image-name ^String (.getDockerImageName container)
         logger (log log-to container)]
-    (.registerContainerForCleanup ^ResourceReaper (reaper-instance)
+    (swap! started-instances conj {:type :container :id container-id})
-                                  container-id
-                                  image-name)
     (-> container-config
         (merge {:id           container-id
                 :mapped-ports mapped-ports
@@ -384,7 +387,7 @@
 
      (let [network (.build builder)
            network-name (.getName network)]
-       (.registerNetworkIdForCleanup ^ResourceReaper (reaper-instance) network-name)
+       (swap! started-instances conj {:type :network :id :network-name})
        {:network network
         :name    network-name
         :ipv6    (.getEnableIpv6 network)
@@ -392,10 +395,32 @@
 
 (def ^:deprecated init-network create-network)
 
+(defn- remove-network! [instance]
+  (-> (DockerClientFactory/instance)
+      (.client)
+      (.removeNetworkCmd (:id instance))
+      (.exec))
+  instance)
+
+(defn- stop-and-remove-container! [instance]
+  (let [docker-client (DockerClientFactory/instance)]
+    (-> docker-client
+        (.client)
+        (.stopContainerCmd (:id instance))
+        (.exec))
+    (-> docker-client
+        (.client)
+        (.removeContainerCmd (:id instance))
+        (.exec)))
+  instance)
+
 (defn perform-cleanup!
   "Stops and removes all container instances which were created in the active JVM or REPL session"
   []
-  (.performCleanup ^ResourceReaper (reaper-instance)))
+  (for [instance @started-instances]
+    (swap! started-instances disj (case (:type instance)
+                                    :container (stop-and-remove-container! instance)
+                                    :network (remove-network! instance)))))
 
 
 ;; REPL Helpers

test/clj_test_containers/core_test.clj

@@ -9,7 +9,7 @@
 
 (deftest create-test
   (testing "Testing basic testcontainer generic image initialisation"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}})
           initialized-container (sut/start! container)
@@ -21,7 +21,9 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Testing log access to the container with string logs"
-    (let [container (sut/init {:container (PostgreSQLContainer. "postgres:12.2")
+    (let [container (sut/create {:image-name    "postgres:15.3"
+                                 :exposed-ports [5432]
+                                 :env-vars      {"POSTGRES_PASSWORD" "pw"}
                                  :log-to        {:log-strategy :string}})
           initialized-container (sut/start! container)]
       (Thread/sleep 500)
@@ -29,13 +31,19 @@
 
   (testing "Testing log access to the container with function logs"
     (let [logs (atom [])]
-      (sut/start! (sut/init {:container (PostgreSQLContainer. "postgres:12.2")
+      (sut/start! (sut/init {:container (PostgreSQLContainer. "postgres:15.3")
+                             :exposed-ports [5432]
                              :log-to    {:log-strategy :fn
                                          :function     #(swap! logs conj %)}}))
       (is (filter #(includes? "database system is ready to accept connections" %) @logs))))
 
+  (testing "Testing log access to the container with unconfigured logger"
+    (let [container  (sut/start! (sut/init {:container (PostgreSQLContainer. "postgres:15.3")
+                                            :exposed-ports [5432]}))]
+      (is (thrown? IllegalStateException (sut/dump-logs container)))))
+
   (testing "Testing basic testcontainer generic image initialisation with wait for log message"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}
                                  :wait-for      {:wait-strategy   :log
@@ -51,7 +59,7 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Testing basic testcontainer generic image initialisation with wait for host port"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}
                                  :wait-for      {:wait-strategy :port}})
@@ -65,11 +73,8 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Testing basic testcontainer generic image initialisation with wait for http"
-    (let [container (sut/create {:image-name      "alpine:3.5"
+    (let [container (sut/create {:image-name      "bitnami/nginx:1.22"
                                  :network-aliases ["foo"]
-                                 :command         ["/bin/sh"
-                                                   "-c"
-                                                   "while true ; do printf 'HTTP/1.1 200 OK\\n\\nyay' | nc -l -p 8080; done"]
                                  :exposed-ports   [8080]
                                  :wait-for        {:wait-strategy  :http
                                                    :path           "/"
@@ -104,7 +109,8 @@
 
 
   (testing "Executing a command in the running Docker container with a custom container"
-    (let [container (sut/init {:container (PostgreSQLContainer. "postgres:12.2")})
+    (let [container (sut/init {:container (PostgreSQLContainer. "postgres:15.3")
+                               :exposed-ports [5432]})
           initialized-container (sut/start! container)
           result (sut/execute-command! initialized-container ["whoami"])
           _stopped-container (sut/stop! container)]
@@ -114,7 +120,7 @@
 (deftest execute-command-in-container
 
   (testing "Executing a command in the running Docker container"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}})
           initialized-container (sut/start! container)
@@ -126,7 +132,7 @@
 (deftest init-volume-test
 
   (testing "Testing mapping of a classpath resource"
-    (let [container (-> (sut/create {:image-name    "postgres:12.2"
+    (let [container (-> (sut/create {:image-name    "postgres:15.3"
                                      :exposed-ports [5432]
                                      :env-vars      {"POSTGRES_PASSWORD" "pw"}})
                         (sut/map-classpath-resource! {:resource-path  "test.sql"
@@ -143,7 +149,7 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Testing mapping of a filesystem-binding"
-    (let [container (-> (sut/create {:image-name    "postgres:12.2"
+    (let [container (-> (sut/create {:image-name    "postgres:15.3"
                                      :exposed-ports [5432]
                                      :env-vars      {"POSTGRES_PASSWORD" "pw"}})
                         (sut/bind-filesystem! {:host-path      "."
@@ -160,7 +166,7 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Copying a file from the host into the container"
-    (let [container (-> (sut/create {:image-name    "postgres:12.2"
+    (let [container (-> (sut/create {:image-name    "postgres:15.3"
                                      :exposed-ports [5432]
                                      :env-vars      {"POSTGRES_PASSWORD" "pw"}})
                         (sut/copy-file-to-container! {:path           "test.sql"
@@ -178,7 +184,7 @@
 
 
   (testing "Copying a file from the classpath into the container"
-    (let [container (-> (sut/create {:image-name    "postgres:12.2"
+    (let [container (-> (sut/create {:image-name    "postgres:15.3"
                                      :exposed-ports [5432]
                                      :env-vars      {"POSTGRES_PASSWORD" "pw"}})
                         (sut/copy-file-to-container! {:path           "test.sql"
@@ -195,7 +201,7 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Copying a file from the host into a running container"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}})
           initialized-container (sut/start! container)
@@ -214,7 +220,7 @@
       (is (nil? (:mapped-ports stopped-container)))))
 
   (testing "Copying a file from the classpath into a running container"
-    (let [container (sut/create {:image-name    "postgres:12.2"
+    (let [container (sut/create {:image-name    "postgres:15.3"
                                  :exposed-ports [5432]
                                  :env-vars      {"POSTGRES_PASSWORD" "pw"}})
           initialized-container (sut/start! container)