Modify ui Dockerfile to use repo root as context
This matches the pattern of the other Dockerfiles in the repo
and is required in order to include the git commit hash in built
images.
@@ -17,9 +17,9 @@ FROM node:lts-alpine as canopy-app-build-stage
RUN apk update && apk add python g++ git make && rm -rf /var/cache/apk/*
WORKDIR /ui
-COPY grid-ui/package*.json ./
+COPY ui/grid-ui/package*.json ./
RUN npm config set unsafe-perm true && npm install
-COPY grid-ui .
+COPY ui/grid-ui .
ENV REACT_APP_SPLINTER_URL "/splinterd"
ENV REACT_APP_SAPLING_URL "/sapling-dev-server"
ENV REACT_APP_GRID_URL "/gridd"
@@ -35,9 +35,9 @@ RUN apk update && apk add git
RUN npm config set unsafe-perm true
-COPY saplings saplings
-COPY sapling-dev-server sapling-dev-server
-COPY protos protos
+COPY ui/saplings saplings
+COPY ui/sapling-dev-server sapling-dev-server
+COPY ui/protos protos
ARG PUBLIC_URL_PARTIAL
ENV PUBLIC_URL $PUBLIC_URL_PARTIAL
@@ -80,7 +80,7 @@ RUN mkdir /usr/local/apache2/htdocs/sapling-dev-server
RUN tar -xzvf /tmp/grid_saplings_*.tar.gz \
-C /usr/local/apache2/htdocs/sapling-dev-server/
-COPY /configs/apache/httpd.conf /usr/local/apache2/conf/httpd.conf
+COPY ui/configs/apache/httpd.conf /usr/local/apache2/conf/httpd.conf
RUN echo "\
\n\
