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

Jump to bottom

Various Micronaut-related cleanup items #17611

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Various Micronaut-related cleanup items #17611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
786f37d
Various Micronaut-related cleanup items
jdpgrailsdev Oct 5, 2022
4b73b51
Merge branch 'master' into jonathan/cron-configuration
jdpgrailsdev Oct 7, 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
13 changes: 13 additions & 0 deletions airbyte-cron/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@ application {
applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
}

Properties env = new Properties()
rootProject.file('.env.dev').withInputStream { env.load(it) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we getting .env.dev and not .env?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gosusnp The theory is that this is being used for quick, local testing and therefore use the dev version. However, if the .env.dev is not reliable, etc, this could easily be switched.


run {
// default for running on local machine.
env.each { entry ->
environment entry.getKey(), entry.getValue()
}

environment 'AIRBYTE_ROLE', System.getenv('AIRBYTE_ROLE')
environment 'AIRBYTE_VERSION', env.VERSION
}

tasks.named("buildDockerImage") {
dependsOn copyGeneratedTar
}
4 changes: 2 additions & 2 deletions airbyte-cron/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ micronaut:
access:
- isAnonymous()
server:
port: 9000
port: 9001

datasources:
config:
Expand Down Expand Up @@ -52,7 +52,7 @@ airbyte:
initialization-timeout-ms: ${CONFIGS_DATABASE_INITIALIZATION_TIMEOUT_MS:60000}
minimum-migration-version: ${CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION}
local:
docker-mount: ${LOCAL_DOCKER_MOUNT}
docker-mount: ${LOCAL_DOCKER_MOUNT:}
root: ${LOCAL_ROOT}
role: ${AIRBYTE_ROLE:}
temporal:
Expand Down
9 changes: 8 additions & 1 deletion airbyte-cron/src/main/resources/micronaut-banner.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
: airbyte-cron :

___ _ __ __
/ | (_)____/ /_ __ __/ /____
/ /| | / / ___/ __ \/ / / / __/ _ \
/ ___ |/ / / / /_/ / /_/ / /_/ __/
/_/ |_/_/_/ /_.___/\__, /\__/\___/
/____/
: airbyte-cron :