Merge branch 'develop'

Author: codejsha

.gitmodules

@@ -2,5 +2,5 @@
     path = confluent/confluent-kafka-script-generator
     url = https://github.com/codejsha/confluent-kafka-script-generator.git
 [submodule "macos/zsh/plugins"]
-	path = macos/zsh/plugins
-	url = https://github.com/codejsha/zsh-plugins.git
+    path = macos/zsh/plugins
+    url = https://github.com/codejsha/zsh-plugins.git

git/git-commands.sh

@@ -146,8 +146,11 @@ git checkout -b <branch-name> <commit-hash>
 
 ######################################################################
 
+### remove a file history from the git repository
+
 git ls-files
 
+export FILE_PATH="/path/to/file"
 git filter-branch --force --index-filter \
 'git rm --cached --ignore-unmatch ${FILE_PATH}' \
 --prune-empty --tag-name-filter cat -- --all

go/go-commands.sh

@@ -4,6 +4,10 @@ go run main.go
 
 ######################################################################
 
+### test
+
+go clean -testcache
+
 go test ./...
 go test ./... -v -coverprofile=cover.out
 

kafka/kafdrop/docker-run-kafdrop-commands.sh

@@ -4,12 +4,12 @@ HOSTNAME="$(hostname --fqdn)"
 HOSTIP="$(ip -4 addr show scope global dev eth0 | grep inet | awk '{print $2}' | cut -d / -f 1 | sed -n 1p)"
 
 docker container run \
-	--rm \
+    --rm \
     --detach \
-	--name kafdrop \
-	--publish 9003:9000 \
+    --name kafdrop \
+    --publish 9003:9000 \
     --env KAFKA_BROKERCONNECT="${HOSTNAME}:9092" \
     --env SCHEMAREGISTRY_CONNECT="http://${HOSTNAME}:8081" \
     --env CMD_ARGS="--message.format=AVRO" \
-	--add-host="${HOSTNAME}:${HOSTIP}" \
+    --add-host="${HOSTNAME}:${HOSTIP}" \
     obsidiandynamics/kafdrop:latest

kafka/kafka-ui/docker-run-kafka-ui-commands.sh

@@ -4,14 +4,14 @@ HOSTNAME="$(hostname --fqdn)"
 HOSTIP="$(ip -4 addr show scope global dev eth0 | grep inet | awk '{print $2}' | cut -d / -f 1 | sed -n 1p)"
 
 docker container run \
-	--rm \
+    --rm \
     --detach \
-	--name kafka-ui \
-	--publish 9080:8080 \
-	--env KAFKA_CLUSTERS_0_NAME="clusterlocal" \
-	--env KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS="${HOSTNAME}:9092" \
-	--env KAFKA_CLUSTERS_0_SCHEMAREGISTRY="http://${HOSTNAME}:8081" \
-	--env KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME="connect-cluster" \
-	--env KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS="http://${HOSTNAME}:8083" \
-	--add-host="${HOSTNAME}:${HOSTIP}" \
-	provectuslabs/kafka-ui:latest
+    --name kafka-ui \
+    --publish 9080:8080 \
+    --env KAFKA_CLUSTERS_0_NAME="clusterlocal" \
+    --env KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS="${HOSTNAME}:9092" \
+    --env KAFKA_CLUSTERS_0_SCHEMAREGISTRY="http://${HOSTNAME}:8081" \
+    --env KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME="connect-cluster" \
+    --env KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS="http://${HOSTNAME}:8083" \
+    --add-host="${HOSTNAME}:${HOSTIP}" \
+    provectuslabs/kafka-ui:latest

macos/zsh/.zshrc

@@ -7,9 +7,7 @@ eval "$(atuin init zsh --disable-up-arrow)"
 source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
 source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
 source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source ${HOME}/tools/zsh-plugins/alias.plugin.zsh
-source ${HOME}/tools/zsh-plugins/docker.plugin.zsh
-source ${HOME}/tools/zsh-plugins/docker-compose.plugin.zsh
+source ${HOME}/tools/zsh-plugins/load-zsh-plugins.sh
 FPATH=${HOMEBREW_PREFIX}/share/zsh-completions:${FPATH}
 autoload -Uz compinit
 compinit -C
@@ -31,6 +29,7 @@ alias vi="nvim"
 alias vim="nvim"
 alias vimdiff="nvim -d"
 alias cat="bat --style=plain --paging=never"
+alias fl="open -b com.binarynights.forklift-setapp"
 alias mysql="/opt/homebrew/opt/mysql-client@8.4/bin/mysql"
 alias mysqldump="/opt/homebrew/opt/mysql-client@8.4/bin/mysqldump"
 

weblogic/kubernetes/docker/build-jdk/Dockerfile.jdk11

@@ -26,7 +26,7 @@ ENV LANG en_US.UTF-8
 ENV JAVA_VERSION=11.0.12 \
     JAVA_HOME=/usr/java/jdk-11
 
-ENV	PATH $JAVA_HOME/bin:$PATH
+ENV PATH $JAVA_HOME/bin:$PATH
 
 COPY --from=builder $JAVA_HOME $JAVA_HOME