Merge pull request #39 from kudulab/35-docker-compose-does-not-like-capital-letters

Fix #35 support running with docker-compose when the current directory contains upper case letters

Author: xmik

.circleci/config.yml

@@ -94,22 +94,18 @@ jobs:
       - attach_workspace:
           at: ~/repo
       - run:
-          command: /bin/bash -c "./tasks e2e ubuntu18"
+          command: /bin/bash -c "./tasks e2e ubuntu"
       - run:
-          command: /bin/bash -c "./tasks test_signals ubuntu18"
+          command: /bin/bash -c "./tasks test_signals ubuntu"
 
   test_images:
     executor: platform
     steps:
       - setup
-      - run:
-          command: sudo git clone https://github.com/bats-core/bats-core /opt/bats-core
-      - run:
-          command: sudo git clone https://github.com/bats-core/bats-assert /opt/bats-assert
-      - run:
-          command: sudo git clone https://github.com/bats-core/bats-support /opt/bats-support
       - attach_workspace:
           at: ~/repo
+      - run:
+          command: /bin/bash -c "cd image_scripts && sudo ./tasks install_bats"
       - run:
           command: /bin/bash -c "cd image_scripts && ./tasks build"
       - run:
@@ -153,5 +149,5 @@ commands:
 executors:
   platform:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2204:2024.01.1
     working_directory: ~/repo

.gitignore

@@ -141,3 +141,5 @@ dmypy.json
 
 test/test-files/custom-dir-env-var
 /ops/
+
+dojo-signal-test-output

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.12.0 (2024-Feb-04)
+
+* Compile Dojo using Golang 1.21.6 thanks to using Docker image kudulab/golang-dojo:2.1.0
+* Improve support for Docker-compose >2.
+  * New versions of Docker-compose (e.g. 2.24.5) have different output of the `docker-compose ps` command (than the old versions of Docker-compose, e.g. 1.23.2). This was affecting Dojo as in Dojo was not aware that the containers were already created and running. This, in turn, was affecting the logging collection (the `--print-logs` options).
+  * Also, the default docker containers in Docker-compose >2 contain this string `-default-` (with dashes), while the older versions of Docker-compose contained this string `_default_` (with underscores)
+* Fix https://github.com/kudulab/dojo/issues/35 - support the case when the current directory contains upper case letters and Docker-Compose >2 is run
+
 ### 0.11.0 (2022-Feb-27)
 
 * Compile Dojo using Golang 1.17.7 thanks to using Docker image kudulab/golang-dojo:2.0.0

Dojofile.build

@@ -1,2 +1,2 @@
-DOJO_DOCKER_IMAGE=kudulab/golang-dojo:2.0.0
+DOJO_DOCKER_IMAGE=kudulab/golang-dojo:2.1.0
 DOJO_DOCKER_OPTIONS="--security-opt seccomp:unconfined"

Dojofile.e2e-alpine

@@ -1,2 +1,2 @@
-DOJO_DOCKER_IMAGE="kudulab/inception-dojo:alpine-dind-0.3.0"
+DOJO_DOCKER_IMAGE="kudulab/inception-dojo:alpine-0.6.1"
 DOJO_DOCKER_OPTIONS="--privileged"

Dojofile.e2e-ubuntu

@@ -0,0 +1,2 @@
+DOJO_DOCKER_IMAGE="kudulab/inception-dojo:ubuntu-0.6.1"
+DOJO_DOCKER_OPTIONS="--privileged"

Dojofile.e2e-ubuntu18

@@ -1,5 +1,5 @@
 # this is not a public image
-DOJO_DOCKER_IMAGE="kudulab/golang-gdojo:0.1.0"
+DOJO_DOCKER_IMAGE="kudulab/golang-gdojo:0.2.0"
 DOJO_WORK_INNER="/dojo/work/src/dojo"
 DOJO_DOCKER_OPTIONS="--security-opt seccomp:unconfined"