andyjk15/db-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[26.06.20] Fixing registry mapping with / in name

Browse Source
This commit is contained in:
andyjk15 2020-06-26 17:02:43 +01:00
parent 7e22e4bb4a
commit 33e4f4eada
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration/pipelines/build.groovy
View File

@ -7,8 +7,9 @@ env.GIT_REPOSITORY_PATH = "github.com/andyjk15/${env.APPLICATION_NAME}.git"
env.GIT_REPOSITORY_URL = "https://${env.GIT_REPOSITORY_PATH}" env.GIT_REPOSITORY_URL = "https://${env.GIT_REPOSITORY_PATH}"
env.GITHUB_CREDENTIALS_ID = 'Github' env.GITHUB_CREDENTIALS_ID = 'Github'
env.DIGITAL_OCEAN = 'registry.digitalocean.com' env.DIGITAL_OCEAN = 'registry.digitalocean.com'
env.DIGITAL_OCEAN_REPO = 'cryptosky-image-registry'
env.DOCKER_BUILDER = 'registry.cryptosky.me' env.DOCKER_BUILDER = 'registry.cryptosky.me'
env.DOCKER_REPOSITORY = "${env.DIGITAL_OCEAN}/cryptosky-image-registry" env.DOCKER_REPOSITORY = "${env.DIGITAL_OCEAN}/${env.DIGITAL_OCEAN_REPO}"
env.DOCKER_REPOSITORY_TCP = "tcp://${env.DOCKER_BUILDER}:4243" env.DOCKER_REPOSITORY_TCP = "tcp://${env.DOCKER_BUILDER}:4243"
env.NAMESPACE = 'production' env.NAMESPACE = 'production'
@ -66,7 +67,8 @@ try {
mvn 'clean package -DskipTests' mvn 'clean package -DskipTests'
executeShellScript("configuration/scripts/mapVarsToConfigs.sh", executeShellScript("configuration/scripts/mapVarsToConfigs.sh",
env.DOCKER_REPOSITORY, env.DIGITAL_OCEAN,
env.DIGITAL_OCEAN_REPO,
env.APPLICATION_NAME, env.APPLICATION_NAME,
env.APPLICATION_VERSION, env.APPLICATION_VERSION,
env.APPLICATION_LABEL) env.APPLICATION_LABEL)

11
configuration/scripts/mapVarsToConfigs.sh
View File

@ -1,9 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DOCKER_REPOSITORY=$1 DIGITAL_OCEAN=$1
APPLICATION_NAME=$2 DIGITAL_OCEAN_REPO=$2
APPLICATION_VERSION=$3 APPLICATION_NAME=$3
APPLICATION_LABEL=$4 APPLICATION_VERSION=$4
APPLICATION_LABEL=$5
DOCKER_REPOSITORY="${DIGITAL_OCEAN}/${DIGITAL_OCEAN_REPO}"
sed -i "s/REPOSITORY/${DOCKER_REPOSITORY}/g" configuration/kubernetes/deployment.yaml sed -i "s/REPOSITORY/${DOCKER_REPOSITORY}/g" configuration/kubernetes/deployment.yaml
sed -i "s/IMAGE/${APPLICATION_NAME}:${APPLICATION_VERSION}/g" configuration/kubernetes/deployment.yaml sed -i "s/IMAGE/${APPLICATION_NAME}:${APPLICATION_VERSION}/g" configuration/kubernetes/deployment.yaml