Skip to content

Commit 169ea5f

Browse files
Use latest Datasette (#12)
- bump the build to `datasette:latest`. - remove the deprecated `hash_urls` setting. - install `datasette-hashed-urls`. - force `pandas` to 1.0, to avoid a bug in csvs-to-sqlite with v2.0. - comment out a broken `apt-get -y upgrade` during the build.
1 parent bdec89e commit 169ea5f

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

Dockerfile

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
FROM datasetteproject/datasette:0.54
1+
FROM datasetteproject/datasette:latest
22

3-
RUN apt-get update && apt-get -y upgrade && \
4-
apt-get install --no-install-recommends -y \
5-
build-essential \
6-
unzip \
7-
&& \
8-
apt-get clean
3+
RUN apt-get update
4+
# RUN apt-get -y upgrade
5+
RUN apt-get install --no-install-recommends -y build-essential unzip
6+
RUN apt-get clean
97

108
WORKDIR /mnt/datasette
119

@@ -15,6 +13,10 @@ WORKDIR /mnt/datasette
1513
# for geojson api responses - https://pypi.org/project/geojson/
1614
RUN pip install csvs-to-sqlite sqlite-utils geojson plpygis
1715

16+
# pandas 2.0 breaks csvs-to-sqlite.
17+
# https://github.com/simonw/csvs-to-sqlite/pull/92
18+
RUN pip install --force-reinstall "pandas~=1.0"
19+
1820
# Add the csv data files
1921
COPY data/ .
2022

@@ -29,6 +31,8 @@ RUN /usr/local/bin/labs-import-csv-files-to-sqlite.sh
2931
COPY ./plugins/ ./databases/plugins/
3032
COPY settings.json ./databases/
3133

34+
RUN datasette install datasette-hashed-urls
35+
3236
# CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "/mnt/datasette/databases"]
3337
# fix the dbs not starting in immutable mode, https://github.com/simonw/datasette/pull/1229
34-
CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/darien.db", "-i", "databases/gorongosa.db", "-i", "databases/kenya.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000", "--setting", "hash_urls", "1"]
38+
CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/darien.db", "-i", "databases/gorongosa.db", "-i", "databases/kenya.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000"]

docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
build:
55
context: .
66
dockerfile: Dockerfile
7-
command: ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/darien.db", "-i", "databases/gorongosa.db", "-i", "databases/kenya.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000", "--setting", "hash_urls", "1"]
7+
command: ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/darien.db", "-i", "databases/gorongosa.db", "-i", "databases/kenya.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000"]
88
ports:
99
- "8001:80"
1010
volumes:

0 commit comments

Comments
 (0)