Refactor level-2 branch to use remote db

.dockerignore

@@ -1,4 +1,5 @@
 .git/
+.gitignore
 Dockerfile
 docker-compose.yml
 __pycache__/
@@ -8,4 +9,7 @@ data-raw/
 data-clean/
 venv/
 todo
-.DS_Store
+.DS_Store
+.env
+data-private/
+data-public/

.env.example

@@ -1,15 +1,15 @@
 # Mode (level 1 or 2)
-MODE=1
+MODE=2
 
 # The database URL
 # ----------------
 #
 # This is the postgres instance the parsed cases will
 # load data into.
 #
-# If you use the Dockerfile you don't need to change this.
+# If you use the Dockerfile you don't need to change this. Otherwise make this the remote
 
-DATABASE_URL=postgres://postgres:oca@db/oca
+DATABASE_URL=
 
 
 # Amazon Web Services (AWS) configuration
@@ -32,13 +32,4 @@ AWS_S3_BUCKET_NAME=
 SFTP_HOST=
 SFTP_USER=
 SFTP_PSWD=
-SFTP_DIR=
-
-# The RDS- remove database URL
-# ----------------
-#
-# This is the postgres instance that others can connect to
-#
-# Leave blank if you do NOT want to clone the data over to RDS
-
-CLONED_DATABASE_URL=
+SFTP_DIR=

Dockerfile

@@ -19,12 +19,12 @@ RUN apt-get install -y \
 # Check the latest version here https://www.nyc.gov/site/planning/data-maps/open-data/dwn-gdelx.page
 ENV RELEASE=23d
 ENV MAJOR=23
-ENV MINOR=3
+ENV MINOR=4
 ENV PATCH=0
 WORKDIR /geosupport
 
 RUN  pip install python-geosupport; \
-    FILE_NAME=linux_geo${RELEASE}_${MAJOR}_${MINOR}.zip; \
+    FILE_NAME=linux_geo${RELEASE}_${MAJOR}.${MINOR}.zip; \
     echo ${FILE_NAME}; \
     curl -O https://s-media.nyc.gov/agencies/dcp/assets/files/zip/data-tools/bytes/$FILE_NAME; \
     unzip *.zip; \

docker-compose.yml

@@ -7,43 +7,4 @@ services:
       dockerfile: Dockerfile
     user: 'root'
     volumes:
-      - .:/app
-    depends_on: 
-      db:
-        condition: service_healthy
-    links:
-      - db
-  db:
-    image: postgres:15.3-alpine
-    environment:
-      - POSTGRES_DB=oca
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=oca
-    ports:
-      - 5432:5432
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
-      timeout: 5s
-      interval: 1s
-      retries: 20
-    command:
-      # See https://osm2pgsql.org/doc/manual.html#tuning-the-postgresql-server
-      - "postgres"
-      - "-c"
-      - "shared_buffers=256MB"
-      - "-c"
-      - "work_mem=25MB"
-      - "-c"
-      - "maintenance_work_mem=128MB"
-      - "-c"
-      - "wal_level=minimal"
-      - "-c"
-      - "max_wal_size=4GB"
-      - "-c"
-      - "checkpoint_completion_target=0.9"
-      - "-c"
-      - "max_wal_senders=0"
-      - "-c"
-      - "random_page_cost=1.0"
-      - "-c"
-      - "checkpoint_timeout=30min"
+      - .:/app