Commit 2c26880b authored by Dave Cooper's avatar Dave Cooper
Browse files

collecting up a few things

parent 73281fa6
Loading
Loading
Loading
Loading
Loading
+11 −10
Original line number Diff line number Diff line
@@ -98,18 +98,19 @@ HOST_USER_NAME=${USER}

gendl_user="gendl-user"

if [ -n "${CI_COMMIT_REF_NAME}" ]; then
  branch=${CI_COMMIT_REF_NAME//\/\//--}
else
  branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null); ret_code=$?; branch=${branch//\//--}
  if [ "$ret_code" -ne "0" ]; then
    branch="unspecified"
      branch="local"
  fi
fi

echo "impl: $impl"
gendl_container=$(docker ps | grep "gendl:${branch}${impl}")

echo "gendl_container: ${gendl_container}"
gendl_container=$(docker ps -q -f name="gendl:${branch}${impl}")

if [ -n "${gendl_container}" ]; then
    echo "Container running image gendl:${branch}-${impl} already exists."
if ! [ "${gendl_container}" = "" ]; then
    echo "gendl-${branch}-${impl} container already appears to exist, as ${gendl_container}."
    echo "Stop it and start a new one? (Y/n)"
    read -r y_or_n
    if [ -z "${y_or_n}" ] || [ "${y_or_n}" = "Y" ] || [ "${y_or_n}" = "y" ]; then
@@ -122,7 +123,7 @@ if [ -n "${gendl_container}" ]; then
    fi
fi

docker pull genworks/gendl:${branch}-${impl} 2> /dev/null || true
DOCKER_CONFIG=~/.docker-dockerhub-genworks docker pull genworks/gendl:${branch}-${impl} 2> /dev/null || true

echo ""
echo "Starting container with following environmental values:"
+5 −5
Original line number Diff line number Diff line
@@ -451,12 +451,12 @@ being generated dynamically.
			 :pre-published? t
			 :host host object-args))))
    (if existing
	(format t "Found existing ~s, and :overwrite was not specified to publish-shared.
Not replacing existing instance in `gwl:*instance-hash-table*`~%"
	(format t ":overwrite not specified to publish-shared, 
Not replacing existing ~a in `gwl:*instance-hash-table*`~%"
		requested-type)
	(progn
	  (setf (gethash key *instance-hash-table*) (list self))
	  (format t "Just set ~s into the instance hash table." self)))
	;; set self into there. 
	(setf (gethash key *instance-hash-table*) (list self)))

    
    (let ((hosts (or (ensure-list (or hosts host (the host))) (list nil)))
	  (function