diff --git a/.github/workflows/docker_img.yml b/.github/workflows/docker_img.yml index 56f661c9d317e82ca1514e9e20dd560f860b98c2..92ca8df05ec007316c39b6965e653455ca392a4e 100644 --- a/.github/workflows/docker_img.yml +++ b/.github/workflows/docker_img.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest env: MATOMO_ID_DEV: '7' - MATAMO_URL_DEV: 'https://stats-dev.humanbrainproject.eu/' + MATOMO_URL_DEV: 'https://stats-dev.humanbrainproject.eu/' MATOMO_ID_PROD: '12' - MATAMO_URL_PROD: 'https://stats.humanbrainproject.eu/' + MATOMO_URL_PROD: 'https://stats.humanbrainproject.eu/' PRODUCTION: 'true' DOCKER_REGISTRY: 'docker-registry.ebrains.eu/siibra/' SIIBRA_API_STABLE: 'https://siibra-api-stable.apps.hbp.eu/v1_0' @@ -27,18 +27,18 @@ jobs: if [[ "$GITHUB_REF" == 'refs/heads/master' ]] then echo "Either master, using prod env..." - echo "MATAMO_URL=${{ env.MATAMO_URL_PROD }}" >> $GITHUB_ENV + echo "MATOMO_URL=${{ env.MATOMO_URL_PROD }}" >> $GITHUB_ENV echo "MATOMO_ID=${{ env.MATOMO_ID_PROD }}" >> $GITHUB_ENV echo "BS_REST_URL=${{ env.SIIBRA_API_STABLE }}" >> $GITHUB_ENV elif [[ "$GITHUB_REF" == 'refs/heads/staging' ]] then echo "Either staging, using staging env..." - echo "MATAMO_URL=${{ env.MATAMO_URL_PROD }}" >> $GITHUB_ENV + echo "MATOMO_URL=${{ env.MATOMO_URL_PROD }}" >> $GITHUB_ENV echo "MATOMO_ID=${{ env.MATOMO_ID_PROD }}" >> $GITHUB_ENV echo "BS_REST_URL=${{ env.SIIBRA_API_RC }}" >> $GITHUB_ENV else echo "Using dev env..." - echo "MATAMO_URL=${{ env.MATAMO_URL_DEV }}" >> $GITHUB_ENV + echo "MATOMO_URL=${{ env.MATOMO_URL_DEV }}" >> $GITHUB_ENV echo "MATOMO_ID=${{ env.MATOMO_ID_DEV }}" >> $GITHUB_ENV echo "BS_REST_URL=${{ env.SIIBRA_API_LATEST }}" >> $GITHUB_ENV fi @@ -60,8 +60,8 @@ jobs: echo "Building $DOCKER_BUILT_TAG" docker build \ --build-arg VERSION=$VERSION \ - --build-arg MATAMO_URL=$MATAMO_URL \ - --build-arg MATAMO_ID=$MATAMO_ID \ + --build-arg MATOMO_URL=$MATOMO_URL \ + --build-arg MATOMO_ID=$MATOMO_ID \ --build-arg BS_REST_URL=$BS_REST_URL \ -t $DOCKER_BUILT_TAG \ . diff --git a/.openshift/okd_branch_tmpl.yaml b/.openshift/okd_branch_tmpl.yaml index 06e43a9e67b3740a00b47aef9eb6ef37445b4a92..10c5a0fbc9b654f24db27d1fe66cd099d2c17dde 100644 --- a/.openshift/okd_branch_tmpl.yaml +++ b/.openshift/okd_branch_tmpl.yaml @@ -53,12 +53,6 @@ objects: name: plugins - configMapRef: name: other-deploy-config - - configMapRef: - name: obj-storage-env-var - prefix: OBJ_STORAGE_ - - configMapRef: - name: obj-stoage-credentials - prefix: OBJ_STORAGE_ image: "docker-registry.ebrains.eu/siibra/siibra-explorer:${BRANCH_NAME}" imagePullPolicy: Always