🐙 octavia-cli: bump and publish with same version as Airbyte core (ai…

…rbytehq#11464)
LOVEGISER · Mar 29, 2022 · 9d46ef8 · 9d46ef8
1 parent 624bb4a
commit 9d46ef8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -41,3 +41,9 @@ serialize =
 [bumpversion:file:kube/overlays/stable-with-resource-limits/.env]
 
 [bumpversion:file:kube/overlays/stable-with-resource-limits/kustomization.yaml]
+
+[bumpversion:file:octavia-cli/install.sh]
+
+[bumpversion:file:octavia-cli/README.md]
+
+[bumpversion:file:octavia-cli/Dockerfile]
diff --git a/octavia-cli/Dockerfile b/octavia-cli/Dockerfile
@@ -14,5 +14,5 @@ USER octavia-cli
 WORKDIR /home/octavia-project
 ENTRYPOINT ["octavia"]
 
-LABEL io.airbyte.version=dev
+LABEL io.airbyte.version=0.35.61-alpha
 LABEL io.airbyte.name=airbyte/octavia-cli
diff --git a/octavia-cli/README.md b/octavia-cli/README.md
@@ -104,7 +104,7 @@ This script:
 ```bash
 touch ~/.octavia # Create a file to store env variables that will be mapped the octavia-cli container
 mkdir my_octavia_project_directory # Create your octavia project directory where YAML configurations will be stored.
-docker run --name octavia-cli -i --rm -v my_octavia_project_directory:/home/octavia-project --network host --user $(id -u):$(id -g) --env-file ~/.octavia airbyte/octavia-cli:latest
+docker run --name octavia-cli -i --rm -v my_octavia_project_directory:/home/octavia-project --network host --user $(id -u):$(id -g) --env-file ~/.octavia airbyte/octavia-cli:0.35.61-alpha
 ```
 
 ### Using `docker-compose`
@@ -352,4 +352,4 @@ $ octavia apply
 
 | Version | Date       | Description      | PR                                                       |
 |---------|------------|------------------|----------------------------------------------------------|
-| 0.1.0   | 2022-04-07 | Alpha release    | [EPIC](https://github.com/airbytehq/airbyte/issues/10704)|
+| 0.35.61 | 2022-04-07 | Alpha release    | [EPIC](https://github.com/airbytehq/airbyte/issues/10704)|
diff --git a/octavia-cli/install.sh b/octavia-cli/install.sh
@@ -3,7 +3,7 @@
 # This install scripts currently only works for ZSH and Bash profiles.
 # It creates an octavia alias in your profile bound to a docker run command and your current user.
 
-VERSION=0.1.0
+VERSION=0.35.61-alpha
 OCTAVIA_ENV_FILE=${HOME}/.octavia
 
 detect_profile() {

diff --git a/octavia-cli/publish.sh b/octavia-cli/publish.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
-set -ux
+set -uxe
 VERSION=$1
+GIT_REVISION=$2
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+docker run --privileged --rm tonistiigi/binfmt --install all # This installs the emulator to build multi-arch images
+set +e # Disable exit if the next command fails if the builder already exist.
 docker buildx create --name octavia_builder > /dev/null 2>&1
-set -e
+set -e # The previous command can fail safely if
 docker buildx use octavia_builder
 docker buildx inspect --bootstrap
-docker buildx build --push --tag airbyte/octavia-cli:${VERSION} --platform=linux/arm64,linux/amd64 ${SCRIPT_DIR}
+docker buildx build --push --tag airbyte/octavia-cli:${VERSION} --platform=linux/arm64,linux/amd64 --label "io.airbyte.git-revision=${GIT_REVISION}" ${SCRIPT_DIR}
diff --git a/tools/bin/release_version.sh b/tools/bin/release_version.sh
@@ -42,3 +42,6 @@ VERSION=$NEW_VERSION SUB_BUILD=PLATFORM ./gradlew clean build
 SUB_BUILD=PLATFORM ./gradlew publish
 VERSION=$NEW_VERSION GIT_REVISION=$GIT_REVISION docker-compose -f docker-compose.build.yaml push
 echo "Completed building and publishing..."
+
+VERSION=$NEW_VERSION SUB_BUILD=OCTAVIA_CLI ./gradlew clean build
+./octavia-cli/publish.sh ${NEW_VERSION} ${GIT_REVISION}