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