From 915bc40927f423ca090a1284b3be53ad6ded4f44 Mon Sep 17 00:00:00 2001
From: Kenzo-Hugo Hillion <kenzo-hugo.hillion1@pasteur.fr>
Date: Mon, 8 Jun 2020 11:48:55 +0200
Subject: [PATCH] add commit hash to footer
---
ci/build/build_frontend.sh | 2 +-
docker-compose.yaml | 2 +-
frontend/src/App.vue | 3 +--
frontend/src/components/Navbar.vue | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ci/build/build_frontend.sh b/ci/build/build_frontend.sh
index 3e57822..b3c9a19 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 5c3986c..23a11a4 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 04d75f2..091467d 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 95b50d6..169b5fc 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>
--
GitLab