Skip to content

Commit

Permalink
Merge pull request #507 from terra-money/is-sprint-24
Browse files Browse the repository at this point in the history
Is sprint 24
  • Loading branch information
mwmerz authored Aug 31, 2023
2 parents 4703e45 + 9f89460 commit c2cb977
Show file tree
Hide file tree
Showing 34 changed files with 2,032 additions and 21,837 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
SASS_PATH=node_modules:src/styles

# Docker Compose
COMPOSE_PROJECT_NAME=localterra
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ WORKDIR /app
RUN set -eux &&\
apt update &&\
apt install -y \
libudev-dev \
libusb-1.0-0-dev
libudev-dev \
libusb-1.0-0-dev

COPY package*.json ./
COPY tsconfig.json ./
Expand All @@ -17,8 +17,8 @@ RUN set -eux && \

COPY . .

ARG REACT_APP_ASSETS="https://assets.terra.money" \
REACT_APP_STATION_ASSETS="https://station-assets.terra.money"
ARG REACT_APP_ASSETS="https://assets.terra.dev" \
REACT_APP_STATION_ASSETS="https://station-assets.terra.dev"

ENV REACT_APP_ASSETS=${REACT_APP_ASSETS} \
REACT_APP_STATION_ASSETS=${REACT_APP_STATION_ASSETS}
Expand All @@ -30,8 +30,8 @@ RUN set -eux && \

FROM node:16 as reloader

ARG REACT_APP_ASSETS="https://assets.terra.money" \
REACT_APP_STATION_ASSETS="https://station-assets.terra.money"
ARG REACT_APP_ASSETS="https://assets.terra.dev" \
REACT_APP_STATION_ASSETS="https://station-assets.terra.dev"

ENV REACT_APP_ASSETS=${REACT_APP_ASSETS} \
REACT_APP_STATION_ASSETS=${REACT_APP_STATION_ASSETS}
Expand Down
Loading

0 comments on commit c2cb977

Please sign in to comment.