Skip to content

Commit

Permalink
Revert "updated docker and software version (#10)" (#11)
Browse files Browse the repository at this point in the history
This reverts commit 8b7bbe6.
JinIgarashi authored Dec 23, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 8b7bbe6 commit 8b9b515
Showing 13 changed files with 571 additions and 749 deletions.
43 changes: 0 additions & 43 deletions .github/workflows/docker-image.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 18.x
node-version: 12.x
- run: npm ci
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
public/tiles
.DS_Store

# Logs
logs
14 changes: 11 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Start from ubuntu
FROM node:lts-bullseye
FROM ubuntu:16.04

# Update repos and install dependencies
RUN apt-get update \
@@ -8,16 +8,24 @@ RUN apt-get update \
build-essential \
libsqlite3-dev \
zlib1g-dev \
git
curl \
wget \
git \
nodejs \
npm

# Build tippecanoe
RUN mkdir -p /tmp/src
WORKDIR /tmp/src
RUN git clone https://github.com/felt/tippecanoe.git
RUN git clone https://github.com/mapbox/tippecanoe.git
WORKDIR /tmp/src/tippecanoe
RUN make \
&& make install

# Install Nodejs
RUN npm cache clean && npm install n -g && n stable \
&& n 12.18.1 && ln -sf /usr/local/bin/node /usr/bin/node

# Install postgis2mbtiles-docker
RUN mkdir -p /tmp/src
WORKDIR /tmp/src
6 changes: 1 addition & 5 deletions config.js
Original file line number Diff line number Diff line change
@@ -6,13 +6,9 @@ module.exports = {
password:process.env.db_password,
host:process.env.db_host,
port:process.env.db_port,
database:process.env.db_name,
database:'rwss_assets',
},
name: 'WASAC RWSS Vector Tiles',
description: 'Vector tiles for water supply data at Rural Water and Sanitation Services in WASAC, Rwanda',
attribution: '©WASAC, Ltd.',
mbtiles: __dirname + '/data/rwss.mbtiles',
createPmtiles: true,
minzoom: 8,
maxzoom: 14,
layers : [
Binary file modified data/rwss.mbtiles
Binary file not shown.
Binary file removed data/rwss.pmtiles
Binary file not shown.
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ services:
- db_password=$db_password
- db_host=host.docker.internal
- db_port=5432
- db_name=rwss_assets
volumes:
- ./data:/tmp/src/data
- ./public:/tmp/src/public
4 changes: 1 addition & 3 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -5,6 +5,4 @@ echo "db_user=${db_user}" > .env
echo "db_password=${db_password}" > .env
echo "db_host=${db_host}" > .env
echo "db_port=${db_port}" > .env
echo "db_name=${db_name}" > .env
npm run create
npm run extract
npm run create
6 changes: 0 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
@@ -11,12 +11,6 @@ const generate = async () =>{
const pg2mbtiles = new postgis2mbtiles(config);
const file_mbtile = await pg2mbtiles.run()
console.log(`mbtiles was generated: ${file_mbtile}`);
if (config.createPmtiles) {
config.mbtiles = config.mbtiles.replace('.mbtiles', '.pmtiles')
const pg2pmtiles = new postgis2mbtiles(config);
const file_pmtile = await pg2pmtiles.run()
console.log(`pmtiles was generated: ${file_pmtile}`);
}
console.timeEnd('postgis2mbtiles');
};

1,235 changes: 553 additions & 682 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"homepage": "https://github.com/WASAC/vt#readme",
"dependencies": {
"@watergis/mbtiles2pbf": "^0.2.1",
"@watergis/postgis2mbtiles": "^0.1.6",
"@watergis/postgis2mbtiles": "^0.1.5",
"dotenv": "^8.2.0",
"fs": "0.0.1-security",
"gh-pages": "^3.1.0"
2 changes: 1 addition & 1 deletion public/wss.geojson

Large diffs are not rendered by default.

0 comments on commit 8b9b515

Please sign in to comment.