Compare commits

..

No commits in common. "master" and "0.2.0-pre2.1" have entirely different histories.

4 changed files with 9 additions and 14 deletions

View file

@ -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"]

View file

@ -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

View file

@ -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

View file

@ -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)