Skip to content

Commit 4b55d3a

Browse files
Use latest Datasette (#18)
* Use latest Datasette - bump the build to `datasette:latest`. - remove the deprecated `hash_urls` setting. - install `datasette-hashed-urls`. * Roll pandas back to 1.0
1 parent a1ce23c commit 4b55d3a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM datasetteproject/datasette:0.57
1+
FROM datasetteproject/datasette:latest
22

33
WORKDIR /mnt/datasette
44

@@ -8,6 +8,9 @@ WORKDIR /mnt/datasette
88
# for geojson api responses - https://pypi.org/project/geojson/
99
RUN pip install csvs-to-sqlite sqlite-utils panoptes-client
1010

11+
# pandas 2.0 breaks csvs-to-sqlite.
12+
# https://github.com/simonw/csvs-to-sqlite/pull/92
13+
RUN pip install --force-reinstall "pandas~=1.0"
1114
# add BUILD_DATE arg to invalidate the cache
1215
ARG BUILD_DATE=''
1316

@@ -32,7 +35,9 @@ RUN /usr/local/bin/import-csv-files-to-sqlite.sh
3235
COPY ./plugins/ ./databases/plugins/
3336
COPY settings.json ./databases/
3437

38+
RUN datasette install datasette-hashed-urls
39+
3540
# CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "/mnt/datasette/databases"]
3641
# fix the dbs not starting in immutable mode, https://github.com/simonw/datasette/pull/1229
37-
CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/subjects.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"]
42+
CMD ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/subjects.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000"]
3843

docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
args:
77
BUILD_DATE: 'test-date'
88
dockerfile: Dockerfile
9-
command: ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/subjects.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"]
9+
command: ["datasette", "-p", "80", "-h", "0.0.0.0", "--cors", "-i", "databases/subjects.db", "--plugins-dir=databases/plugins", "--inspect-file=databases/inspect-data.json", "--setting", "sql_time_limit_ms", "60000", "--setting", "max_returned_rows", "50000"]
1010
ports:
1111
- "8001:80"
1212
volumes:

0 commit comments

Comments
 (0)