clean up docker images

build.sh

@@ -2,13 +2,11 @@
 
 function lint() {
   echo "Running linter..."
-  eslint cli/ --ext .js
   grep -rl '^#! */usr/bin/env node' cli/bin | xargs eslint
 }
 
 function lint_fix() {
   echo "Running linter with fix..."
-  eslint cli/ --ext .js --fix
   grep -rl '^#! */usr/bin/env node' cli/bin | xargs eslint --fix
 }
 

cli/bin/compose

@@ -9,23 +9,23 @@ function up() {
     _with_arguments 1 "$@"
     profile=${1}; shift
     prefix=${1:-${directory_name}}; shift
-    docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" up -d "$@"
+    docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" up -d "$@"
 }
 
 # @COMMAND down [profile]                 tear down profile
 function down() {
     _with_arguments 1 "$@"
     profile=${1}; shift
     prefix=${1:-${directory_name}}; shift
-    docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" down "$@"
+    docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" down "$@"
 }
 
 # @COMMAND stop [profile] <prefix>        stops profile
 function stop() {
   _with_arguments 1 "$@"
   profile=${1}; shift
   prefix=${1:-${directory_name}}; shift
-  docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" stop "$@"
+  docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" stop "$@"
 }
 
 # @COMMAND profile [name]                 opens profile for edit

cli/bin/image

@@ -5,134 +5,6 @@
 
 source selfedit.sh
 
-DOCKER_IMAGES_HOME=${VIQUEEN_DEVBOX_HOME}/docker-images
-DOCKER_HUB_NAMESPACE=${NAMESPACE:-viqueen}
-
-_image() {
-    _with_arguments 2 "$@"
-    name=${1}
-    version=${2}
-    if [[ ${DOCKER_HUB_NAMESPACE} == "/" ]]; then
-      namespace=""
-    else
-      namespace=${DOCKER_HUB_NAMESPACE}/
-    fi
-    echo "${namespace}${name}:${version}"
-}
-
-# @COMMAND build [name] [tag]       builds a docker image in viqueen namespace
-function build() {
-    image=$(_image "$@")
-    name=${1}
-    baseVersion=${2}
-    target=${DOCKER_IMAGES_HOME}/${name}/
-
-    if [[ -f "${target}/jdk.Dockerfile" ]]; then
-        sed "s/\${JDK_VERSION}/${baseVersion}/g" "${target}"/jdk.Dockerfile > "${target}"/Dockerfile
-    fi
-    if [[ -f "${target}/ubuntu.Dockerfile" ]]; then
-        sed "s/\${UBUNTU_VERSION}/${baseVersion}/g" "${target}"/ubuntu.Dockerfile > "${target}"/Dockerfile
-    fi
-    if [[ -f "${target}/node.Dockerfile" ]]; then
-      sed "s/\${NODE_VERSION}/${baseVersion}/g" "${target}"/node.Dockerfile > "${target}"/Dockerfile
-    fi
-    if [[ -f "${target}/confluence.Dockerfile" ]]; then
-      sed "s/\${CONFLUENCE_VERSION}/${baseVersion}/g" "${target}"/confluence.Dockerfile > "${target}"/Dockerfile
-    fi
-    if [[ -f "${target}/golang.Dockerfile" ]]; then
-      sed "s/\${GO_VERSION}/${baseVersion}/g" "${target}"/golang.Dockerfile > "${target}"/Dockerfile
-    fi
-
-    shift
-    shift
-
-    docker build -t "${image}" "${target}"/ "$@"
-}
-
-# @COMMAND file [name] [tag]        generates a docker file for a given image template
-function file() {
-  image=$(_image "$@")
-  name=${1}
-  baseVersion=${2}
-  target=${DOCKER_IMAGES_HOME}/${name}/
-
-  if [[ -f "${target}/jdk.Dockerfile" ]]; then
-      sed "s/\${JDK_VERSION}/${baseVersion}/g" "${target}"/jdk.Dockerfile > "${target}"/Dockerfile
-  fi
-  if [[ -f "${target}/ubuntu.Dockerfile" ]]; then
-      sed "s/\${UBUNTU_VERSION}/${baseVersion}/g" "${target}"/ubuntu.Dockerfile > "${target}"/Dockerfile
-  fi
-  if [[ -f "${target}/node.Dockerfile" ]]; then
-    sed "s/\${NODE_VERSION}/${baseVersion}/g" "${target}"/node.Dockerfile > "${target}"/Dockerfile
-  fi
-  if [[ -f "${target}/confluence.Dockerfile" ]]; then
-    sed "s/\${CONFLUENCE_VERSION}/${baseVersion}/g" "${target}"/confluence.Dockerfile > "${target}"/Dockerfile
-  fi
-  if [[ -f "${target}/golang.Dockerfile" ]]; then
-    sed "s/\${GO_VERSION}/${baseVersion}/g" "${target}"/golang.Dockerfile > "${target}"/Dockerfile
-  fi
-}
-
-# @COMMAND scan [name] [tag]        scans a docker image in viqueen namespace
-function scan() {
-  image=$(_image "$@")
-  docker scan "${image}"
-}
-
-# @COMMAND push [name] [tag]        pushes a docker image to viqueen namespace on docker hub
-function push() {
-    image=$(_image "$@")
-    shift
-    shift
-    docker push "${image}" "$@"
-}
-
-_run_cmd() {
-    _with_arguments 2 "$@"
-    image=$(_image "${1}" "${2}")
-    shift
-    shift
-    if [[ -n ${1} ]]; then
-      options="--name ${1}"
-      shift
-    fi
-    # shellcheck disable=SC2145
-    echo "docker run ${options} $@ -it --entrypoint=/bin/bash ${image}"
-}
-
-# @COMMAND run [name] [tag]         runs a docker image from viqueen namespace
-function run() {
-    cmd=$(_run_cmd "$@")
-    echo -e "${GREEN}Execute ${cmd}${COLOR_OFF}"
-    eval "${cmd}"
-}
-
-_mount_cmd() {
-    _with_arguments 2 "$@"
-    directory=$(pwd)
-    volume_name=$(basename "${directory}")
-    image=$(_image "${1}" "${2}")
-    shift
-    shift
-    options="--name ${volume_name} --volume ${directory}:/sources/${volume_name}"
-    # shellcheck disable=SC2145
-    echo "docker run ${options} -it --entrypoint=/bin/bash -w=/sources/${volume_name} $@ ${image}"
-}
-
-# @COMMAND mount [name] [tag]         mounts current working directory as volume onto image
-function mount() {
-    cmd=$(_mount_cmd "$@")
-    echo -e "${GREEN}Execute ${cmd}${COLOR_OFF}"
-    eval "${cmd}"
-}
-
-# @COMMAND dismount                   cleans up current working directory as volume
-function dismount() {
-  directory=$(pwd)
-  volume_name=$(basename "${directory}")
-  docker rm "${volume_name}"
-}
-
 _start_cmd() {
     _with_arguments 1 "$@"
     container=${1}
@@ -161,9 +33,6 @@ function cmd() {
         "start")
             _start_cmd "$@"
             ;;
-        "mount")
-            _mount_cmd "$@"
-            ;;
         "run")
             _run_cmd "$@"
             ;;
@@ -194,11 +63,6 @@ function stop() {
     docker ps -a | tail -n +2 | awk '{ print $1 }' | xargs docker stop
 }
 
-# @COMMAND list
-function list() {
-    ls -lrt "${DOCKER_IMAGES_HOME}"
-}
-
 # shellcheck disable=SC2068
 eval $@