Skip to content

Commit 0304f98

Browse files
committed
Merge branch 'feature/command' into develop
2 parents 3ef6b81 + 43fce3d commit 0304f98

File tree

8 files changed

+13
-15
lines changed

8 files changed

+13
-15
lines changed

docker/docker-commands.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
######################################################################
22

3+
docker container run --rm -it --name busybox busybox:latest
4+
docker container run --rm -it --name dnstools infoblox/dnstools:latest
5+
6+
######################################################################
7+
38
### process
49
sudo pgrep -xa dockerd | grep dockerd
510
sudo pgrep -xa docker-proxy | grep docker-proxy

docker/docker-compose-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ docker compose up --detach
1414
docker compose up -d
1515

1616
docker compose start
17-
docker-compose restart
17+
docker compose restart
1818

1919
######################################################################
2020

docker/tool/base64-encoded.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

docker/tool/docker-run-busybox-commands.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

docker/tool/docker-run-dnstools-commands.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

git/git-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GIT_TRACE=1 git push origin main
88
git clone <REPO_URL>
99
git clone --recurse-submodules <REPO_URL>
1010

11-
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
11+
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -n "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
1212

1313
######################################################################
1414

linux/bash-commands.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ alias watch="watch "
2929

3030
######################################################################
3131

32+
### base64
33+
echo -n ${USERNAME}:${PASSWORD} | base64
34+
35+
######################################################################
36+
3237
### location
3338

3439
export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"

macos/zsh/.zshrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ function change-java-temurin-11() { JAVA_HOME="/Library/Java/JavaVirtualMachines
4646
function change-java-temurin-17() { JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home"; export JAVA_HOME; ${JAVA_HOME}/bin/java -version; }
4747
function change-java-temurin-21() { JAVA_HOME="/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home"; export JAVA_HOME; ${JAVA_HOME}/bin/java -version; }
4848

49-
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
49+
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -n "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }

0 commit comments

Comments
 (0)