Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(mbtiles): update mbtiles to new version #16

Merged
merged 2 commits into from
Jun 18, 2024
Merged

chore(mbtiles): update mbtiles to new version #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19053d4
bump versions and release on readme
RyanLauQF Jun 14, 2024
ed16069
updated mbtiles version for ci
RyanLauQF Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github-templates/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ self_version: "v1.1.0"

versions:
- tileserver: ["v3.1.1"]
mbtiles: ["0-18_20210325T212157Z", "0-18_20220815T202133Z"]
mbtiles: ["0-18_20210325T212157Z", "0-18_20220815T202133Z", "0-18_20240612T202043Z"]
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
mbtiles: "0-18_20210325T212157Z"
- tileserver: "v3.1.1"
mbtiles: "0-18_20220815T202133Z"
- tileserver: "v3.1.1"
mbtiles: "0-18_20240612T202043Z"
runs-on: ubuntu-latest
env:
IMAGE_NAME: sg-tileserver-gl
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG TILESERVER_GL_VERSION="v4.6.6"
ARG TILESERVER_GL_VERSION="v3.1.1"
FROM maptiler/tileserver-gl:${TILESERVER_GL_VERSION} AS native

# This must be run after setup.sh
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Next run:

```bash
# Check out <https://github.com/dsaidgovsg/sg-tileserver-gl/releases/tag/mbtiles> for the possible tags
MBTILES_TAG=0-18_20220815T202133Z ./setup.sh
MBTILES_TAG=0-18_20240612T202043Z ./setup.sh
```

This will get all the files placed into `data/` (git ignored), ready for the final Docker build step
Expand Down Expand Up @@ -118,7 +118,7 @@ Then run the following to run the above image to run the build:
docker run --rm -it \
-v "${PWD}:/app" \
-u "$(id -u):$(id -g)" \
-e "MBTILES_TAG=0-18_20220815T202133Z" \
-e "MBTILES_TAG=0-18_20240612T202043Z" \
sg-tileserver-gl-builder:latest \
./setup.sh
```
Expand Down
2 changes: 1 addition & 1 deletion setup-scripts/download-mbtiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if ! command -v curl >/dev/null; then
fi

if [[ -z "${MBTILES_TAG}" ]]; then
>&2 echo "Please specify 'MBTILES_TAG' to target the mbtiles file to download (e.g. 0-18_20220815T202133Z)"
>&2 echo "Please specify 'MBTILES_TAG' to target the mbtiles file to download (e.g. 0-18_20240612T202043Z)"
exit 1
fi

Expand Down
Loading