fixed version info

Morni-Cloud-3 · Feb 8, 2021 · 43173a2 · 43173a2
1 parent f94a40f
commit 43173a2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
 # Build Vue
 FROM node:14.5.0-alpine as build-stage
 
+ARG VUE_APP_VERSION
+ENV VUE_APP_VERSION=${VUE_APP_VERSION}
+
 WORKDIR /app
 COPY ./frontend/package*.json ./
 RUN npm install
@@ -11,8 +14,6 @@ RUN npm run build
 FROM lsiobase/alpine:3.12 as deploy-stage
 # MAINTANER Your Name "info@selfhosted.pro"
 
-ARG VUE_APP_VERSION=devel
-ENV VUE_APP_VERSION=${VUE_APP_VERSION}
 # Set Variables
 ENV PYTHONIOENCODING=UTF-8
 ENV THEME=Default

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yacht",
-  "version": "0.1.0",
+  "version": "0.0.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/frontend/src/views/ServerSettings.vue b/frontend/src/views/ServerSettings.vue
@@ -21,7 +21,7 @@
             </v-card-text>
           </v-col>
         </v-row>
-        <v-card-text>Version: {{get_version()}}</v-card-text>
+        <v-card-text>Version: {{version}}</v-card-text>
       </v-card>
     </v-container>
   </v-card>
@@ -31,16 +31,14 @@
 // import { mapState } from "vuex";
 import ServerSettingsNav from "../components/serverSettings/ServerSettingsNav";
 export default {
+  data() {
+    return {
+      version: process.env.VUE_APP_VERSION || 'unreleased',
+    };
+  },
   components: {
     Nav: ServerSettingsNav,
-  },
-  methods: {
-    get_version() {
-      if (process.env.VUE_APP_VERSION) {
-        return process.env.VUE_APP_VERSION;
-      } else return null;
-    },
-  },
+  }
 };
 </script>
 

diff --git a/root/etc/cont-init.d/32-env b/root/etc/cont-init.d/32-env
@@ -9,5 +9,6 @@ do
 
   sed -i 's|VUE_APP_THEME|'${THEME}'|g' $file 
   sed -i 's|VUE_APP_LOGO|'${LOGO}'|g' $file
+  # sed -i 's|VUE_APP_VERSION|'${VERSION}'|g' $file
 
 done