diff --git a/ci/build/build_frontend.sh b/ci/build/build_frontend.sh index 3e5782236d93cde1fa79858b1fa450c1b0abfe13..b3c9a1974d4fad8e73e7453c18036cdec8cfcc0f 100644 --- a/ci/build/build_frontend.sh +++ b/ci/build/build_frontend.sh @@ -1,6 +1,6 @@ #!/bin/sh docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY -docker build -t "$CI_REGISTRY_IMAGE/frontend:${CI_COMMIT_REF_NAME}" frontend/ +docker build -t "$CI_REGISTRY_IMAGE/frontend:${CI_COMMIT_REF_NAME}" --build-arg VUE_APP_GIT_COMMIT=${CI_COMMIT_SHORT_SHA} frontend/ docker tag "$CI_REGISTRY_IMAGE/frontend:${CI_COMMIT_REF_NAME}" "$CI_REGISTRY_IMAGE/frontend:latest" docker push "$CI_REGISTRY_IMAGE/frontend:${CI_COMMIT_REF_NAME}" diff --git a/docker-compose.yaml b/docker-compose.yaml index 5c3986cc37372923ff9cfa4550037aba719a0134..23a11a487f208e2022f524dbd17539d938e01680 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -45,7 +45,7 @@ services: - postgresql environment: NODE_ENV: development - GIT_COMMIT: local-test + VUE_APP_GIT_COMMIT: "local-dev-env" nginx: image: nginx:1.13.12-alpine diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 04d75f20e106d85f463dabe5299638adf77eef99..091467de9b0851271a08de2c2a0c3e82d9f94539 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -27,8 +27,7 @@ export default { }, computed: { commitHash() { - return process.env.GIT_COMMIT; - console.log(process.env) + return process.env.VUE_APP_GIT_COMMIT; }, } }; diff --git a/frontend/src/components/Navbar.vue b/frontend/src/components/Navbar.vue index 95b50d640aea69b3a3c391ac342ce075798da228..169b5fc785ad84b120f77e873d7163b489a2cf37 100644 --- a/frontend/src/components/Navbar.vue +++ b/frontend/src/components/Navbar.vue @@ -9,7 +9,7 @@ <v-spacer></v-spacer> <Help/> <v-btn href="https://gitlab.pasteur.fr/metagenomics/metagenedb" flat target="_blank" class="ma-0 pa-2"> - <span>Source</span> + <span>GitLab</span> <v-icon class="ml-1">fab fa-gitlab</v-icon> </v-btn> </v-toolbar>