Merge branch 'main' into host-waitforsql

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 3
+  rebase-strategy: disabled
+- package-ecosystem: gomod
+  directory: "/e2e"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 3
+  rebase-strategy: disabled

.github/workflows/ci-podman.yml

@@ -0,0 +1,68 @@
+name: Podman pipeline
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        go-version: [1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.x]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Enable systemd user process
+        run: |
+          loginctl enable-linger $(whoami)
+          sleep 1
+
+      - name: Set XDG_RUNTIME_DIR
+        run: echo "XDG_RUNTIME_DIR=/run/user/$UID" >> $GITHUB_ENV
+
+      - name: Install Podman
+        run: |
+          set -x
+          sudo apt-get remove -y podman docker-ce docker docker-engine docker.io containerd runc ||:
+          sudo apt update
+          sudo apt install -y software-properties-common debian-archive-keyring dirmngr
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9
+          sudo add-apt-repository -y "deb http://deb.debian.org/debian experimental main"
+          sudo apt update
+          sudo apt -y -t experimental install podman crun docker-compose
+          sudo systemctl daemon-reload
+          sleep 5
+          sudo systemctl start podman.socket
+          sudo podman info
+
+      - name: Set DOCKER_HOST
+        run: echo "DOCKER_HOST=unix:///run/podman/podman.sock" >> $GITHUB_ENV
+
+      - name: modVerify
+        run: go mod verify
+
+      - name: modTidy
+        run: go mod tidy
+
+      - name: gotestsum
+        # only run tests on linux, there are a number of things that won't allow the tests to run on anything else
+        # many (maybe, all?) images used can only be build on Linux, they don't have Windows in their manifest, and
+        # we can't put Windows Server in "Linux Mode" in Github actions
+        # another, host mode is only available on Linux, and we have tests around that, do we skip them?
+        run: sudo make test-unit
+
+      - name: modTidy e2e tests
+        run: make -C e2e tools-tidy
+
+      - name: Run e2e tests
+        run: sudo make test-e2e
+
+      - name: Run checker
+        run: |
+          ./scripts/check_environment.sh

.github/workflows/ci.yml

@@ -4,10 +4,10 @@ on: [push, pull_request]
 
 jobs:
   static-analysis:
-    runs-on: [ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run ShellCheck
         run: |
           shellcheck scripts/*.sh
@@ -18,24 +18,19 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.14.x, 1.15.x, 1.x]
+        go-version: [1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.x]
         platform: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
 
       - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-          go get gotest.tools/gotestsum
+        uses: actions/checkout@v3
 
       - name: modVerify
         run: go mod verify
@@ -57,12 +52,24 @@ jobs:
         # we can't put Windows Server in "Linux Mode" in Github actions
         # another, host mode is only available on Linux, and we have tests around that, do we skip them?
         if: ${{ matrix.platform == 'ubuntu-latest' }}
-        run: gotestsum --format short-verbose -- -coverprofile=cover.txt ./...
+        run: make test-unit
 
         # only report code coverage on linux
       - name: Upload coverage report
         if: ${{ matrix.platform == 'ubuntu-latest' }}
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
-          file: ./cover.txt
+          files: ./cover.txt
           name: testcontainers-go-${{ matrix.go-version }}
+
+      - name: modTidy e2e tests
+        if: ${{ matrix.platform == 'ubuntu-latest' }}
+        run: make -C e2e tools-tidy
+
+      - name: Run e2e tests
+        if: ${{ matrix.platform == 'ubuntu-latest' }}
+        run: make test-e2e
+
+      - name: Run checker
+        run: |
+          ./scripts/check_environment.sh

.gitignore

@@ -8,5 +8,6 @@ site/
 src/mkdocs-codeinclude-plugin
 src/pip-delete-this-directory.txt
 .idea/
+.DS_Store
 
 cover.txt

Makefile

@@ -0,0 +1,21 @@
+
+.PHONY: test-all
+test-all: tools test-unit test-e2e
+
+.PHONY: test-unit
+test-unit:
+	@echo "Running unit tests..."
+	go run gotest.tools/gotestsum \
+		--format short-verbose \
+		--rerun-fails=5 \
+		--packages="./..." \
+		-- -coverprofile=cover.txt
+
+.PHONY: test-e2e
+test-e2e:
+	@echo "Running end-to-end tests..."
+	make -C e2e test
+
+.PHONY: tools
+tools:
+	go mod download

Pipfile

@@ -7,6 +7,7 @@ verify_ssl = true
 
 [packages]
 mkdocs = "*"
+mkdocs-codeinclude-plugin = "*"
 mkdocs-material = "*"
 mkdocs-markdownextradata-plugin = "*"