Skip to content

Fix version bump in docker/up.sh #2129

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

Merged
wslulciuc merged 8 commits into from
Sep 20, 2022
Merged

Fix version bump in docker/up.sh #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb8d7e4
Bump version in .env.example
wslulciuc Sep 20, 2022
eaac39f
Remove version bump of docker/up.sh in new-version.sh
wslulciuc Sep 20, 2022
0baf363
Use VERSION in docker/up.sh
wslulciuc Sep 20, 2022
62d7dc7
Add version bump via VERSION
wslulciuc Sep 20, 2022
fc842ad
continued: Add version bump via VERSION
wslulciuc Sep 20, 2022
8de309e
Resolve merge conflicts
wslulciuc Sep 20, 2022
4ae6714
Fix version bump for docker/up.sh and .env.example
wslulciuc Sep 20, 2022
3302e51
Revert version bump for psql
wslulciuc Sep 20, 2022
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 .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
API_PORT=5000
API_ADMIN_PORT=5001
WEB_PORT=3000
TAG=0.19.0
TAG=0.26.0
2 changes: 1 addition & 1 deletion chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ postgresql:
## @param image.tag PostgreSQL image tag (immutable tags are recommended)
##
image:
tag: 0.26.0
tag: 12.1.0
## Authentication parameters
## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
Expand Down
11 changes: 6 additions & 5 deletions docker/up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

set -e

SCRIPTDIR=$(dirname $0)
VERSION=0.26.0
DOCKER_DIR=$(dirname $0)

title() {
echo -e "\033[1m${1}\033[0m"
Expand Down Expand Up @@ -35,7 +36,7 @@ usage() {
echo " -a, --api-port int api port (default: 5000)"
echo " -m, --api-admin-port int api admin port (default: 5001)"
echo " -w, --web-port int web port (default: 3000)"
echo " -t, --tag string image tag (default: latest)"
echo " -t, --tag string image tag (default: ${VERSION})"
echo
title "FLAGS:"
echo " -b, --build build images from source"
Expand All @@ -55,7 +56,7 @@ args="-V --force-recreate --remove-orphans"
API_PORT=5000
API_ADMIN_PORT=5001
WEB_PORT=3000
TAG=0.19.0
TAG=${VERSION}
while [ $# -gt 0 ]; do
case $1 in
-a|'--api-port')
Expand Down Expand Up @@ -107,6 +108,6 @@ if [[ "${SEED}" = "true" ]]; then
compose_files+=" -f docker-compose.seed.yml"
fi

$SCRIPTDIR/volumes.sh marquez
${DOCKER_DIR}/volumes.sh marquez

API_PORT=${API_PORT} API_ADMIN_PORT=${API_ADMIN_PORT} WEB_PORT=${WEB_PORT} TAG="${TAG}" docker-compose $compose_files up $args
API_PORT=${API_PORT} API_ADMIN_PORT=${API_ADMIN_PORT} WEB_PORT=${WEB_PORT} TAG=${TAG} docker-compose $compose_files up $args
4 changes: 2 additions & 2 deletions new-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ sed -i "" "s/^version:.*/version: ${RELEASE_VERSION}/g" ./chart/Chart.yaml
sed -i "" "s/tag:.*/tag: ${RELEASE_VERSION}/g" ./chart/values.yaml

# (3) Bump version in scripts
sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" ./docker/up.sh
sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" .env.example
sed -i "" "s/VERSION=.*/VERSION=${RELEASE_VERSION}/g" ./docker/up.sh
sed -i "" "s/TAG=.*/TAG=${RELEASE_VERSION}/g" .env.example

# (4) Bump version in docs
sed -i "" "s/^ version:.*/ version: ${RELEASE_VERSION}/g" ./spec/openapi.yml
Expand Down
⚡