Skip to content

Commit

Permalink
fix backend
Browse files Browse the repository at this point in the history
  • Loading branch information
gaetancollaud committed Feb 10, 2018
1 parent 27ee2d6 commit a084e33
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
2 changes: 2 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM frolvlad/alpine-oraclejdk8:slim
EXPOSE 8080
EXPOSE 8081

ADD libs /root/.jssc/

ADD target/*.jar app.jar
RUN sh -c 'touch /app.jar'
ENV JAVA_OPTS=""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain filter
HttpServletResponse response = (HttpServletResponse) res;
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, PUT, DELETE, GET, OPTIONS");
filterChain.doFilter(req, res);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ spring.data.mongodb.host=mongodb
spring.data.mongodb.port=27017
spring.data.mongodb.database=baromatic

management.port=8081
#management.port=8081
server.port=8080

serial.port=/dev/ttsUSB0

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ services:
- "traefik.frontend.rule=PathPrefix:/api"
- "traefik.enable=true"
- "traefik.port=8080"
- "traefik.frontend.priority=10"
frontend:
image: gaetancollaud/bar-o-matic-frontend
container_name: baromatic-frontend
Expand All @@ -28,6 +29,7 @@ services:
- "traefik.frontend.rule=PathPrefix:/"
- "traefik.enable=true"
- "traefik.port=80"
- "traefik.frontend.priority=5"
mongodb:
image: mongo
container_name: cocktail-mongo
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import router from './router'
Vue.use(Vuetify)

Vue.use(VueResource)
Vue.url.options.root = 'http://10.10.0.99:8080/'
// Vue.url.options.root = 'http://10.10.0.99:8080/'

Vue.config.productionTip = false

Expand Down

0 comments on commit a084e33

Please sign in to comment.