Compare commits
5 commits
0.2.0-pre2
...
master
Author | SHA1 | Date | |
---|---|---|---|
ae316bfbe9 | |||
54e8017289 | |||
2d2ce3c45d | |||
88a8273ebc | |||
f7bd710fc0 |
6 changed files with 23 additions and 9 deletions
15
Dockerfile
15
Dockerfile
|
@ -1,13 +1,18 @@
|
|||
FROM node:lts
|
||||
RUN npm install -g http-server
|
||||
FROM node:lts AS source-code
|
||||
WORKDIR /app
|
||||
COPY package*.json ./
|
||||
RUN npm install
|
||||
COPY . .
|
||||
RUN npm install
|
||||
RUN npm run build
|
||||
|
||||
|
||||
FROM nginx:1.17
|
||||
|
||||
WORKDIR /usr/share/nginx/html
|
||||
|
||||
COPY --from=source-code /app/dist /usr/share/nginx/html
|
||||
|
||||
COPY docker/start.sh /start.sh
|
||||
RUN chmod uog+rwx /start.sh
|
||||
|
||||
EXPOSE 8080
|
||||
EXPOSE 80
|
||||
CMD [ "/start.sh"]
|
||||
|
|
2
build.sh
2
build.sh
|
@ -1,2 +1,2 @@
|
|||
docker build -t docker.keks.cloud/keksaccount/gui:latest .
|
||||
docker push docker.keks.cloud/keksaccount/gui:latest
|
||||
docker push docker.keks.cloud/keksaccount/gui:latest
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/sh
|
||||
echo $VUE_APP_API_URL > dist/apiurl
|
||||
http-server dist
|
||||
echo $VUE_APP_API_URL > /usr/share/nginx/html/apiurl
|
||||
nginx -g 'daemon off;'
|
||||
|
|
|
@ -5,7 +5,7 @@ export default {
|
|||
return Api().get('/v1/app')
|
||||
},
|
||||
getAppImage(id) {
|
||||
return process.env.VUE_APP_API_URL+"gui/apps/"+id+"/icon";
|
||||
return localStorage.getItem("apiURL")+"v1/app/"+id+"/icon";
|
||||
},
|
||||
getApp(id) {
|
||||
return Api().get('/v1/app/'+id)
|
||||
|
|
|
@ -13,6 +13,9 @@ export default {
|
|||
},
|
||||
getAPIUrl () {
|
||||
return new Promise((resolve, reject) => {
|
||||
if(localStorage.getItem("apiURL")) {
|
||||
resolve();
|
||||
}
|
||||
axios.get('/apiurl')
|
||||
.then(function (response) {
|
||||
// handle success
|
||||
|
|
|
@ -71,12 +71,18 @@ export default new Vuex.Store({
|
|||
actions: {
|
||||
getSettings: function (context) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if(localStorage.getItem("settings")) {
|
||||
context.commit('setSettings', localStorage.getItem("settings"))
|
||||
resolve();
|
||||
}
|
||||
ServerService.getPublicSettings().then((res) => {
|
||||
localStorage.setItem("settings", res.data.data)
|
||||
context.commit('setSettings', res.data.data)
|
||||
resolve()
|
||||
}).catch((res) => {
|
||||
context.commit('setError')
|
||||
});
|
||||
|
||||
})
|
||||
},
|
||||
checkAccount: function(context) {
|
||||
|
|
Reference in a new issue