mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
Merge branch 'master' into cluster-deploy-no-debug-mode
This commit is contained in:
commit
9101140645
@ -14,6 +14,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
|
DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
|
||||||
|
|||||||
@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
|
SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
|
||||||
|
|||||||
@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
SECRET=${SECRET}
|
SECRET=${SECRET}
|
||||||
|
|||||||
@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
|
|||||||
echo "You must provide a `CONFIGURATION` via environment variable"
|
echo "You must provide a `CONFIGURATION` via environment variable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "Using CONFIGURATION=${CONFIGURATION}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
SECRET=${SECRET}
|
SECRET=${SECRET}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user