Skip to content

Commit ad6eb6e

Browse files
author
MickMake
committed
Update #1 
1 parent 77f340a commit ad6eb6e

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

‎GearBoxOS/etc/bash_completion.d/box-completion.bash

+4-4
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ _box_component_running()
120120
{
121121
local cur=${COMP_WORDS[COMP_CWORD]}
122122

123-
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.project=gearbox -f status=running --format='{{.Image}}')" -- $cur))
123+
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.organization=gearboxworks -f status=running --format='{{.Image}}')" -- $cur))
124124
return 0
125125
}
126126

@@ -129,7 +129,7 @@ _box_component_stopped()
129129
{
130130
local cur=${COMP_WORDS[COMP_CWORD]}
131131

132-
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.project=gearbox -f status=created -f status=exited --format='{{.Image}}')" -- $cur))
132+
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.organization=gearboxworks -f status=created -f status=exited --format='{{.Image}}')" -- $cur))
133133
return 0
134134
}
135135

@@ -138,7 +138,7 @@ _box_component_all()
138138
{
139139
local cur=${COMP_WORDS[COMP_CWORD]}
140140

141-
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.project=gearbox --format='{{.Image}}')" -- $cur))
141+
COMPREPLY=($(compgen -W "$(docker container ls -af label=container.organization=gearboxworks --format='{{.Image}}')" -- $cur))
142142
return 0
143143
}
144144

@@ -162,7 +162,7 @@ _box_component_dockerhub()
162162
do
163163
if [ "${IMAGE_VERSION}" != "latest" ]
164164
then
165-
REPLY="$REPLY gearbox/${IMAGE_NAME}:$IMAGE_VERSION"
165+
REPLY="$REPLY gearboxworks/${IMAGE_NAME}:$IMAGE_VERSION"
166166
fi
167167
done
168168
fi

‎cli/includes/container.functions

+16-16
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ function component_info()
225225
return $RETURN_NO_LOCAL_IMAGE
226226
fi
227227

228-
DOCKER=$(docker inspect --format='{{index .Config.Labels "container.project"}};{{index .Config.Labels "container.name"}};{{index .Config.Labels "container.version"}};{{index .Config.Labels "container.majorversion"}};{{index .Config.Labels "container.latest"}};{{index .Config.Labels "container.class"}};{{index .Config.Labels "container.network"}};{{index .Config.Labels "container.ports"}};{{index .Config.Labels "container.volumes"}};{{index .Config.Labels "container.restart"}};{{index .Config.Labels "container.args"}};{{index .Config.Labels "container.env"}}' ${IMAGE})
228+
DOCKER=$(docker inspect --format='{{index .Config.Labels "container.organization"}};{{index .Config.Labels "container.name"}};{{index .Config.Labels "container.version"}};{{index .Config.Labels "container.majorversion"}};{{index .Config.Labels "container.latest"}};{{index .Config.Labels "container.class"}};{{index .Config.Labels "container.network"}};{{index .Config.Labels "container.ports"}};{{index .Config.Labels "container.volumes"}};{{index .Config.Labels "container.restart"}};{{index .Config.Labels "container.args"}};{{index .Config.Labels "container.env"}}' ${IMAGE})
229229
IFS=';' read -r -a state_array <<< "$DOCKER"
230230

231-
PROJECT="${state_array[0]}"
231+
ORGANIZATION="${state_array[0]}"
232232
IMAGE_NAME="${state_array[1]}"
233233
IMAGE_VERSION="${state_array[2]}"
234234
IMAGE_MAJORVERSION="${state_array[3]}"
@@ -241,12 +241,12 @@ function component_info()
241241
IMAGE_ARGS="${state_array[10]}"
242242
IMAGE_ENV="${state_array[11]}"
243243

244-
if [ "$PROJECT" == "" ]
244+
if [ "$ORGANIZATION" == "" ]
245245
then
246246
return $RETURN_NO_IMAGE_JSON
247247
fi
248248

249-
if [ "$PROJECT" != "${BOX_NAME}" ]
249+
if [ "$ORGANIZATION" != "${BOX_ORGANIZATION}" ]
250250
then
251251
return $RETURN_INVALID_PROJECT
252252
fi
@@ -277,15 +277,15 @@ function component_info()
277277

278278
function is_component_in_repo()
279279
{
280-
local RETURN IFS PROJECT IMAGE_NAME IMAGE_VERSION IMAGE
280+
local RETURN IFS ORGANIZATION IMAGE_NAME IMAGE_VERSION IMAGE
281281
IMAGE=$1
282282

283283
IFS='/:' read -r -a state_array <<< "${IMAGE}"
284-
PROJECT="${state_array[0]}"
284+
ORGANIZATION="${state_array[0]}"
285285
IMAGE_NAME="${state_array[1]}"
286286
IMAGE_VERSION="${state_array[2]}"
287287

288-
# wget -qO /dev/null https://hub.docker.com/v2/repositories/${BOX_NAME}/${IMAGE_NAME}/tags/
288+
# wget -qO /dev/null https://hub.docker.com/v2/repositories/${BOX_ORGANIZATION}/${IMAGE_NAME}/tags/
289289
if [ -f "${BOX_ETC_DIR}/images/${IMAGE_NAME}.json" ]
290290
then
291291
jq --raw-output ".results | .[] | .name" "${BOX_ETC_DIR}/images/${IMAGE_NAME}.json" | grep -q "^${IMAGE_VERSION}\$"
@@ -315,12 +315,12 @@ function update_components()
315315
sudo mkdir -p "${BOX_ETC_DIR}/images"
316316
fi
317317

318-
sudo wget -qNO "${BOX_ETC_DIR}/repositories.json" "https://hub.docker.com/v2/repositories/${BOX_NAME}/?page_size=256"
318+
sudo wget -qNO "${BOX_ETC_DIR}/repositories.json" "https://hub.docker.com/v2/repositories/${BOX_ORGANIZATION}/?page_size=256"
319319
IMAGES="$(jq -r '.results|.[]|.name' "${BOX_ETC_DIR}/repositories.json")"
320320
for IMAGE_NAME in $IMAGES
321321
do
322322
echo -n "."
323-
sudo wget -qNO "${BOX_ETC_DIR}/images/${IMAGE_NAME}.json" "https://hub.docker.com/v2/repositories/${BOX_NAME}/${IMAGE_NAME}/tags/?page_size=256"
323+
sudo wget -qNO "${BOX_ETC_DIR}/images/${IMAGE_NAME}.json" "https://hub.docker.com/v2/repositories/${BOX_ORGANIZATION}/${IMAGE_NAME}/tags/?page_size=256"
324324
done
325325
echo " ${GREEN}OK${RESET}"
326326
}
@@ -341,7 +341,7 @@ function available_components()
341341
do
342342
if [ "${IMAGE_VERSION}" != "latest" ]
343343
then
344-
echo "${BOX_NAME}/${IMAGE_NAME}:${IMAGE_VERSION}"
344+
echo "${BOX_ORGANIZATION}/${IMAGE_NAME}:${IMAGE_VERSION}"
345345
fi
346346
done
347347
fi
@@ -366,9 +366,9 @@ function reallyclean()
366366
echo "$ECHO_PREFIX ${GREEN}Shutting down all Gearbox components.${RESET}"
367367
$0 container shutdown
368368
echo "$ECHO_PREFIX ${GREEN}Removing all Gearbox components.${RESET}"
369-
docker container ls -qaf "label=container.project=${BOX_NAME}" | xargs -r docker container rm
369+
docker container ls -qaf "label=container.organization=${BOX_ORGANIZATION}" | xargs -r docker container rm
370370
echo "$ECHO_PREFIX ${GREEN}Removing all Gearbox component downloads.${RESET}"
371-
docker image ls -qaf "label=container.project=${BOX_NAME}" | xargs -r docker image rm
371+
docker image ls -qaf "label=container.organization=${BOX_ORGANIZATION}" | xargs -r docker image rm
372372
fi
373373
else
374374
echo "$ECHO_PREFIX ${GREEN}Doing nothing.${RESET}"
@@ -765,7 +765,7 @@ function shutdown()
765765

766766
echo "$ECHO_PREFIX ${GREEN}Stopping all Gearbox components. ${RESET} ... "
767767
TEMPFILE="$(mktemp /tmp/box-container.XXX)"
768-
docker container ls -qaf "label=container.project=${BOX_NAME}" | xargs docker stop &> $TEMPFILE
768+
docker container ls -qaf "label=container.organization=${BOX_ORGANIZATION}" | xargs docker stop &> $TEMPFILE
769769
if [ "$?" == "1" ]
770770
then
771771
echo "${RED}NOT OK${RESET}"
@@ -804,15 +804,15 @@ function component_list()
804804
$RETURN_NO_IMAGE_NAME)
805805
echo "$ECHO_PREFIX ${GREEN}Downloaded components: ${CYAN}${IMAGE}${RESET}"
806806
echo "Image Size"
807-
docker image ls -af "label=container.project=${BOX_NAME}" --format "{{.Repository}}:{{.Tag}} \t{{.Size}}"
807+
docker image ls -af "label=container.organization=${BOX_ORGANIZATION}" --format "{{.Repository}}:{{.Tag}} \t{{.Size}}"
808808
echo ""
809809
echo "$ECHO_PREFIX ${GREEN}Stopped components: ${CYAN}${IMAGE}${RESET}"
810810
echo "Container Size Status"
811-
docker container ls -af "label=container.project=${BOX_NAME}" -f "status=created" -f "status=exited" --format "{{.Image}} \t{{.Size}}\t{{.Status}}"
811+
docker container ls -af "label=container.organization=${BOX_ORGANIZATION}" -f "status=created" -f "status=exited" --format "{{.Image}} \t{{.Size}}\t{{.Status}}"
812812
echo ""
813813
echo "$ECHO_PREFIX ${GREEN}Running components: ${CYAN}${IMAGE}${RESET}"
814814
echo "Container Size Status"
815-
docker container ls -af "label=container.project=${BOX_NAME}" -f "status=running" --format "{{.Image}} \t{{.Size}}\t{{.Status}}"
815+
docker container ls -af "label=container.organization=${BOX_ORGANIZATION}" -f "status=running" --format "{{.Image}} \t{{.Size}}\t{{.Status}}"
816816
;;
817817

818818
$RETURN_NO_LOCAL_IMAGE)

‎cli/includes/functions

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export PROJECT_ROOT="${BOX_PROJECTS_ROOT}/${BOX_CURRENT_PROJECT}"
1616
export BOX_PROJECT_DIR="${BOX_PROJECTS_ROOT}/${BOX_CURRENT_PROJECT}"
1717

1818

19+
export BOX_ORGANIZATION="gearboxworks"
1920
export BOX_USER="gearbox"
2021
export BOX_USER_UID="1000"
2122
export BOX_USER_GID="1000"

0 commit comments

Comments
 (0)