update a log message in entrypoint about sourcing the scripts

kudulab · Feb 20, 2022 · 1833ab9 · 1833ab9
1 parent a02fab7
commit 1833ab9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 0.10.5 (2022-Feb-20)
+
+* Update a log message in entrypoint about sourcing the scripts
+
 ### 0.10.4 (2022-Feb-13)
 
 * Fix issue #31. When using Colima instead of Docker Desktop or instead of running Docker on Linux, the output of `docker-compose ps` command is different. Without this fix, Dojo panics with `slice bounds out of range` in this line: https://github.com/kudulab/dojo/blob/0.10.3/docker_compose_driver.go#L633

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ brew install kudulab/homebrew-dojo-osx/dojo
 ```
 * a manual install:
 ```sh
-version="0.10.4"
+version="0.10.5"
 # on Linux:
 wget -O /tmp/dojo https://github.com/kudulab/dojo/releases/download/${version}/dojo_linux_amd64
 # or on Mac:
@@ -82,7 +82,7 @@ dojo "gradle test jar"
 The output should start with a docker command that was executed:
 ```console
 /tmp/gocd-yaml-config-plugin$ dojo "gradle test jar"
-2020/12/09 07:40:28 [ 1]  INFO: (main.main) Dojo version 0.10.4
+2020/12/09 07:40:28 [ 1]  INFO: (main.main) Dojo version 0.10.5
 2020/12/09 07:40:28 [ 4]  INFO: (main.DockerDriver.HandleRun) docker command will be:
  docker run --rm -v /tmp/gocd-yaml-config-plugin:/dojo/work -v /home/tomzo:/dojo/identity:ro --env-file=/tmp/dojo-environment-dojo-gocd-yaml-config-plugin-2020-12-09_07-40-50-60121947 -v /tmp/.X11-unix:/tmp/.X11-unix -ti --name=dojo-gocd-yaml-config-plugin-2020-12-09_07-40-50-60121947 kudulab/openjdk-dojo:1.4.1 "gradle test jar"
 Unable to find image 'kudulab/openjdk-dojo:1.4.1' locally
@@ -263,7 +263,7 @@ We have also established several **best practices** for dojo image development:
 Dojo provides [several scripts](image_scripts/src) to be used inside dojo images to meet most of above requirements. Scripts can be installed in a `Dockerfile` with:
 
 ```dockerfile
-ENV DOJO_VERSION=0.10.4
+ENV DOJO_VERSION=0.10.5
 RUN git clone --depth 1 -b ${DOJO_VERSION} https://github.com/kudulab/dojo.git /tmp/dojo_git &&\
   /tmp/dojo_git/image_scripts/src/install.sh && \
   rm -r /tmp/dojo_git
@@ -293,7 +293,7 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 # Install common Dojo scripts
-ENV DOJO_VERSION=0.10.4
+ENV DOJO_VERSION=0.10.5
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   sudo git ca-certificates && \
@@ -341,7 +341,7 @@ For alpine images a typical dockerfile has following structure:
 FROM alpine:3.15
 
 # Install common Dojo scripts
-ENV DOJO_VERSION=0.10.4
+ENV DOJO_VERSION=0.10.5
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
   apk add --no-cache tini bash shadow sudo git && \
   git clone --depth 1 -b ${DOJO_VERSION} https://github.com/kudulab/dojo.git /tmp/dojo_git &&\

diff --git a/image_scripts/src/entrypoint.sh b/image_scripts/src/entrypoint.sh
@@ -29,7 +29,7 @@ done
 # or source any files or wait for linux daemons
 for SCRIPT in /etc/dojo.d/scripts/* ; do
 	if [ -f ${SCRIPT} ] ; then
-    dojo_entrypoint_log_info "Sourcing: ${SCRIPT}"
+    dojo_entrypoint_log_info "Running: ${SCRIPT}"
 		chmod +x ${SCRIPT}
 		${SCRIPT}
 	fi

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
-const DojoVersion = "0.10.4"
+const DojoVersion = "0.10.5"