diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 74e33a005..78caa1d3d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -99,7 +99,7 @@ jobs: export DEPLOY_IMAGE=ghcr.io/${REPO_LOWER}; export WORKER_IMAGE=ghcr.io/${REPO_LOWER}/worker; export SOLR_IMAGE=ghcr.io/${REPO_LOWER}/solr; - ./bin/helm_deploy ${{ inputs.environment || format('{0}-{1}', github.event.repository.name, inputs.environment) }} ${{ inputs.environment || format('{0}-{1}', github.event.repository.name, inputs.environment) }} + ./bin/helm_deploy ${{ format('{0}-{1}', github.event.repository.name, inputs.environment) }} ${{ format('{0}-{1}', github.event.repository.name, inputs.environment) }} - name: Do deploy if: ${{ inputs.deploy-solr-image }} == 'false' run: | @@ -108,4 +108,4 @@ jobs: export DEPLOY_TAG=${TAG}; export DEPLOY_IMAGE=ghcr.io/${REPO_LOWER}; export WORKER_IMAGE=ghcr.io/${REPO_LOWER}/worker; - ./bin/helm_deploy ${{ inputs.environment || format('{0}-{1}', github.event.repository.name, inputs.environment) }} ${{ inputs.environment || format('{0}-{1}', github.event.repository.name, inputs.environment) }} + ./bin/helm_deploy ${{ format('{0}-{1}', github.event.repository.name, inputs.environment) }} ${{ format('{0}-{1}', github.event.repository.name, inputs.environment) }} diff --git a/ops/production-deploy.tmpl.yaml b/ops/production-deploy.tmpl.yaml index 606e9a8a3..e62bbccdb 100644 --- a/ops/production-deploy.tmpl.yaml +++ b/ops/production-deploy.tmpl.yaml @@ -31,7 +31,7 @@ ingress: env: configmap: - DB_HOST: production-mariadb + DB_HOST: atla-omeka-production-mariadb DB_NAME: omeka DB_PASSWORD: $DB_PASSWORD DB_PORT: 3306