Skip to content

🐙 octavia-cli: bump with same version as Airbyte #11464

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.

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
merged 13 commits into from
Mar 29, 2022
6 changes: 6 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion octavia-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions octavia-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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)|
2 changes: 1 addition & 1 deletion octavia-cli/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
9 changes: 6 additions & 3 deletions octavia-cli/publish.sh
Original file line number Diff line number Diff line change
@@ -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}
3 changes: 3 additions & 0 deletions tools/bin/release_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}