Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix - changed IMAGE_VERSION env. variable default value #3779

Merged
merged 1 commit into from
May 23, 2023
Merged

Fix - changed IMAGE_VERSION env. variable default value #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment/commons/sso/keycloak/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

echo "Building Kapua Keycloak Docker image..."

docker build -f ./docker/Dockerfile -t kapua/kapua-keycloak:"${IMAGE_VERSION:=latest}" . ||
docker build -f ./docker/Dockerfile -t kapua/kapua-keycloak:"${IMAGE_VERSION:=2.0.0-SNAPSHOT}" . ||
{
echo "Building Kapua Keycloak docker image... ERROR!"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker/unix/docker-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

export IMAGE_VERSION=${IMAGE_VERSION:=latest}
export IMAGE_VERSION=${IMAGE_VERSION:=2.0.0-SNAPSHOT}
export CRYPTO_SECRET_KEY="${CRYPTO_SECRET_KEY:=dockerSecretKey!}"
2 changes: 1 addition & 1 deletion deployment/docker/unix/docker-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ done

docker_common

echo "Deploying Eclipse Kapua..."
echo "Deploying Eclipse Kapua version $IMAGE_VERSION..."
docker_compose ${DEBUG_MODE} ${DEV_MODE} ${SSO_MODE} ${SWAGGER} || {
echo "Deploying Eclipse Kapua... ERROR!"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion deployment/minishift/minishift-importer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

ERROR=0
DOCKER_ACCOUNT=${DOCKER_ACCOUNT:=kapua}
IMAGE_VERSION=${IMAGE_VERSION:=latest}
IMAGE_VERSION=${IMAGE_VERSION:=2.0.0-SNAPSHOT}
SERVICES=("console" "api" "sql" "broker" "events-broker")
TMP_DIR="/tmp/kapua-containers-$(date +%s)"

Expand Down
2 changes: 1 addition & 1 deletion deployment/minishift/minishift-pull-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#

DOCKER_ACCOUNT=${DOCKER_ACCOUNT:=kapua}
IMAGE_VERSION=${IMAGE_VERSION:=latest}
IMAGE_VERSION=${IMAGE_VERSION:=2.0.0-SNAPSHOT}
SERVICES=("console" "api" "sql" "broker" "events-broker")

echo "Pulling Kapua images..."
Expand Down
2 changes: 1 addition & 1 deletion deployment/minishift/sso/keycloak-importer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

ERROR=0
DOCKER_ACCOUNT=${DOCKER_ACCOUNT:=kapua}
IMAGE_VERSION=${IMAGE_VERSION:=latest}
IMAGE_VERSION=${IMAGE_VERSION:=2.0.0-SNAPSHOT}
KEYCLOAK="keycloak"
TMP_DIR="/tmp/keycloak-container-$(date +%s)"

Expand Down
2 changes: 1 addition & 1 deletion deployment/openshift/openshift-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPT_DIR}/openshift-common.sh

: DOCKER_ACCOUNT=${DOCKER_ACCOUNT:=kapua}
: IMAGE_VERSION=${IMAGE_VERSION:=latest}
: IMAGE_VERSION=${IMAGE_VERSION:=2.0.0-SNAPSHOT}
: JAVA_OPTS_EXTRA=${JAVA_OPTS_EXTRA:=''}

### Test if the project is already created ... fail otherwise
Expand Down