refactor: Update folder structure (#7)

Author: jgwerner

binder/Dockerfile renamed to Dockerfile

@@ -17,9 +17,7 @@ RUN wget -q "https://github.com/sosedoff/pgweb/releases/download/v${PGWEB_VERSIO
 USER "${NB_USER}"
 WORKDIR "${HOME}"
 RUN python3 -m pip install git+https://github.com/illumidesk/jupyter-pgweb-proxy.git
-RUN jupyter serverextension enable --sys-prefix jupyter_server_proxy \
- && jupyter labextension install @jupyterlab/server-proxy \
- && jupyter lab build
+RUN jupyter serverextension enable --sys-prefix jupyter_server_proxy
 
 # copy configs, update permissions as root
 USER root

Makefile

@@ -25,22 +25,22 @@ help:
 	@grep -E '^[a-zA-Z0-9_%/-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 build: ## build the latest image for a stack
-	${VENV_BIN}/jupyter-repo2docker --no-run --user-id 1000 --user-name jovyan --image-name $(OWNER)/pgweb:$(TAG) ./binder .
+	${VENV_BIN}/jupyter-repo2docker --no-run --user-id 1000 --user-name jovyan --image-name $(OWNER)/pgweb:$(TAG) .
 	@echo -n "Built image size: "
 	@docker images $(OWNER)/pgweb:$(TAG) --format "{{.Size}}"
 
 clean-all: ## remove built images and running containers (including those w/ exit status)
 	@docker rm -f $(shell docker ps -aq)
 
 dev: venv ## run one of the containers (stacks) on port 8889
-	docker-compose -f binder/docker-compose.yaml up -d --build
+	docker-compose -f docker-compose.yaml up -d --build
 
 dev-down:venv ## stop (down) the docker-compose services
-	docker-compose -f binder/docker-compose.yaml down
+	docker-compose -f docker-compose.yaml down
 
 lint: venv ## lint the dockerfile(s)
 	@echo "Linting Dockerfiles with Hadolint in ..."
-	@git ls-files --exclude='Dockerfile*' --ignored binder/docker-compose.yaml | grep -v ppc64 | xargs -L 1 $(HADOLINT) --config .hadolint.yml
+	@git ls-files --exclude='Dockerfile*' --ignored docker-compose.yaml | grep -v ppc64 | xargs -L 1 $(HADOLINT) --config .hadolint.yml
 	@echo "Linting with Hadolint done!"
 	@echo "Linting tests with flake8 ..."
 	${VENV_BIN}/flake8

README.md

@@ -34,8 +34,8 @@ make dev
 
 For example, with the `Scheme` option the string would look like so:
 
-```
-postgres://postgres:postgres@testdb:5432/db?sslmode=disable
+```bash
+postgres://postgres:postgres@testdb:5432/postgres?sslmode=disable
 ```
 
 ### Cleanup

binder/docker-compose.yaml renamed to docker-compose.yaml

@@ -19,6 +19,7 @@ services:
       - POSTGRES_PASSWORD=postgres
     volumes:
       - db:/var/lib/postgresql/data
+      - ./schema.sql:/docker-entrypoint-initdb.d/schema.sql
 
 volumes:
   db: