diff --git a/.drone.yml b/.drone.yml index 2615559..23b9bea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,8 +14,8 @@ steps: - master environment: REACT_APP_PUBLIC_PATH: https://map.vault48.org/ - REACT_APP_API_ADDR: https://backend-map.vault48.org - REACT_APP_OSRM_URL: https://osrm.vault48.org/route/v1 + REACT_APP_API_ADDR: https://backend.map.vault48.org + REACT_APP_OSRM_URL: https://vault48.org:5001/route/v1 REACT_APP_OSRM_PROFILE: bike settings: dockerfile: docker/www/Dockerfile diff --git a/.env.example b/.env.example index 0c12873..0cd2ce7 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -REACT_APP_PUBLIC_PATH = https://map.vault48.org/ -REACT_APP_API_ADDR = https://backend.map.vault48.org +REACT_APP_PUBLIC_PATH = https://alpha-map.vault48.org/ +REACT_APP_API_ADDR = https://alpha-map.vault48.org:3001 REACT_APP_OSRM_URL = https://vault48.org:5001/route/v1 REACT_APP_OSRM_PROFILE = bike diff --git a/docker/www/Dockerfile b/docker/www/Dockerfile index 0c348e7..30177f6 100644 --- a/docker/www/Dockerfile +++ b/docker/www/Dockerfile @@ -1,26 +1,11 @@ # stage1 as builder FROM node:erbium-alpine as builder - COPY package.json yarn.lock ./ - RUN yarn - COPY . . - -ARG REACT_APP_PUBLIC_PATH -ARG REACT_APP_API_ADDR -ARG REACT_APP_OSRM_URL -ARG REACT_APP_OSRM_PROFILE - -ENV REACT_APP_PUBLIC_PATH $REACT_APP_PUBLIC_PATH -ENV REACT_APP_API_ADDR $REACT_APP_API_ADDR -ENV REACT_APP_OSRM_URL $REACT_APP_OSRM_URL -ENV REACT_APP_OSRM_PROFILE $REACT_APP_OSRM_PROFILE - RUN yarn build FROM nginx:alpine - COPY docker/www/nginx.conf /etc/nginx/nginx.conf RUN rm -rf /usr/share/nginx/html/* COPY --from=builder /build /usr/share/nginx/html diff --git a/public/index.html b/public/index.html index b109d7a..0917b3d 100644 --- a/public/index.html +++ b/public/index.html @@ -6,9 +6,6 @@