Skip to content

Commit

Permalink
Update so the image builds (#2026)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattbowen-usds committed Oct 28, 2022
1 parent 4ae403b commit b36af20
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 4 additions & 4 deletions data/data-pipeline/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:20.04

ENV TZ=America/Los_Angeles

# Install packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && TZ=America/Los_Angeles DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential \
make \
gcc \
Expand All @@ -13,7 +15,6 @@ RUN apt-get update && apt-get install -y \
gdal-bin

# tippeanoe
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get install -y software-properties-common libsqlite3-dev zlib1g-dev
RUN apt-add-repository -y ppa:git-core/ppa
Expand All @@ -36,14 +37,13 @@ ENV PYTHONFAULTHANDLER=1 \
POETRY_VERSION=1.1.12

WORKDIR /data-pipeline
COPY pyproject.toml /data-pipeline/
COPY . /data-pipeline

RUN pip install "poetry==$POETRY_VERSION"
RUN poetry config virtualenvs.create false \
&& poetry config virtualenvs.in-project false \
&& poetry install --no-dev --no-interaction --no-ansi

# Copy all project files into the container
COPY . /data-pipeline

CMD python3 -m data_pipeline.application data-full-run --check -s aws
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
environment:
ENV_FOR_DYNACONF: development
PYTHONUNBUFFERED: 1
TZ: America/Los_Angeles

# The score_server serves the data-pipeline volume as a URL
j40_score_server:
Expand All @@ -24,6 +25,9 @@ services:
- ./data/data-pipeline/data_pipeline/data/score:/data/data-pipeline/data_pipeline/data/score
ports:
- 5000:8080
environment:
TZ: America/Los_Angeles


#The j40_website service runs the web app / map / site
j40_website:
Expand All @@ -39,6 +43,7 @@ services:
# open source one from CartoDB), please create your own API TOKEN from
# your MapBox account and add the token here:
MAPBOX_STYLES_READ_TOKEN: ""
TZ: America/Los_Angeles
volumes:
- ./client/src:/client/src
ports:
Expand Down

0 comments on commit b36af20

Please sign in to comment.