Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added VUE_APP_VERSION #261

Merged
merged 1 commit into from
Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout code
- name: Get date
id: date
run: echo "name=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

- name: Checkout code
uses: actions/checkout@v2

- name: Set up QEMU
Expand All @@ -36,6 +40,8 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
args: |
VUE_APP_VERSION=devel-${{ steps.date.outputs.date }}
tags: |
selfhostedpro/yacht:devel
ghcr.io/selfhostedpro/yacht:devel
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ RUN npm run build
FROM lsiobase/alpine:3.12 as deploy-stage
# MAINTANER Your Name "[email protected]"

ARG VUE_APP_VERSION=devel

# Set Variables
ENV PYTHONIOENCODING=UTF-8
ENV THEME=Default
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/serverSettings/ServerInfo.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-card color="foreground" class="elevation-12 pb-8">
<v-card color="foreground" class="elevation-12">
<v-toolbar color="primary" dark flat>
<v-toolbar-title>Server Settings</v-toolbar-title>
<v-spacer></v-spacer>
Expand Down Expand Up @@ -43,7 +43,6 @@
>Export
</v-btn>
</v-card>
<v-card-subtitle> Version: 0.0.6-rc1 </v-card-subtitle>
</v-card>
</template>

Expand Down
6 changes: 6 additions & 0 deletions frontend/src/views/ServerSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</v-card-text>
</v-col>
</v-row>
<v-card-text>Version: {{get_version()}}</v-card-text>
</v-card>
</v-container>
</v-card>
Expand All @@ -32,6 +33,11 @@ import ServerSettingsNav from "../components/serverSettings/ServerSettingsNav";
export default {
components: {
Nav: ServerSettingsNav
},
methods: {
get_version(){
return process.env.VUE_APP_VERSION
},
}
};
</script>
Expand Down