Skip to content

Commit

Permalink
Merge branch 'grey-style'
Browse files Browse the repository at this point in the history
  • Loading branch information
ptbrowne committed May 20, 2022
2 parents 115d40b + a9e8e2d commit 3472a2c
Show file tree
Hide file tree
Showing 7 changed files with 15,068 additions and 10,282 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build:
- medium
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --build-arg COMMIT=$CI_COMMIT_SHA --build-arg VECTOR_TILE_URL=$VECTOR_TILE_URL -t $MAIN_IMAGE_TAG .
- docker build --build-arg COMMIT=$CI_COMMIT_SHA --build-arg MAPTILER_STYLE_KEY=$MAPTILER_STYLE_KEY --build-arg VECTOR_TILE_URL=$VECTOR_TILE_URL -t $MAIN_IMAGE_TAG .
- docker push $MAIN_IMAGE_TAG
only:
- main
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ FROM node:12
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

# build with `docker build --build-arg COMMIT=$(git rev-parse HEAD)` &
# --build-arg VECTOR_TILE_URL=$(url of the vector service)
# build with
# docker build \
# --build-arg COMMIT=$(git rev-parse HEAD) \
# --build-arg VECTOR_TILE_URL=<url of the vector service>
# --build-arg MAPTILER_STYLE_KEY=<maptiler style key>
ARG COMMIT
ARG VECTOR_TILE_URL
ARG MAPTILER_STYLE_KEY

# Build app
COPY package.json yarn.lock ./
Expand All @@ -17,6 +21,7 @@ ENV NODE_ENV production
ENV NODE_OPTIONS=--max_old_space_size=2048
ENV NEXT_PUBLIC_COMMIT=$COMMIT
ENV NEXT_PUBLIC_BASE_VECTOR_TILE_URL=$VECTOR_TILE_URL
ENV NEXT_PUBLIC_MAPTILER_STYLE_KEY=$MAPTILER_STYLE_KEY
ENV PORT 3000

COPY ./ ./
Expand Down
Loading

1 comment on commit 3472a2c

@vercel
Copy link

@vercel vercel bot commented on 3472a2c May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

visualization-tool – ./

visualization-tool-ixt1.vercel.app
visualization-tool-alpha.vercel.app
visualization-tool-git-main-ixt1.vercel.app

Please sign in to comment.