Simplify local setup

Running the client inside a container makes a lot harder to wire up the whole application. The simplified setup only runs the external services within a container, exposing them to the localhost.

Author: Marcelixoo

.env.backend

@@ -10,4 +10,9 @@ JWT_SECRET=Anywhere5=Roast=Drained=Appease=Passion
 NEXTAUTH_SECRET=Anywhere5=Roast=Drained=Appease=Passion
 
 GOOGLE_ID=
-GOOGLE_SECRET=
+GOOGLE_SECRET=
+
+PORT=4000
+ALLOWED_ORIGINS=[ "http://localhost:3000", "https://studio.apollographql.com" ]
+MONGO_CONNECTION_STRING=mongodb://0.0.0.0:27017/codelibrarydb
+DEFAULT_USER_BOOKING_LIMIT=2

.env.dist

@@ -1,42 +1,21 @@
 .PHONY: start
-start: .env.local clean
+start: .env.local npm-install clean
 	docker-compose up -d
 
-.PHONY: init-on-mac
-init-on-mac: generate-certificates trust-on-mac add-localhost-aliases start
-
-.PHONY: init-on-linux
-init-on-linux: generate-certificates trust-on-linux add-localhost-aliases start
-
-.PHONY: generate-certificates
-generate-certificates:
-	docker-compose -f docker-compose.certificates.yml run --rm openssl
-
-.PHONY: trust-on-mac
-trust-on-mac:
-	sudo security add-trusted-cert -d -r trustRoot -k \
-    /Library/Keychains/System.keychain docker/openssl/certs/root-ca.pem
-
-.PHONY: trust-on-linux
-trust-on-linux:
-	sudo cp docker/openssl/certs/root-ca.pem /usr/share/ca-certificates/root-ca.pem \
-	&& sudo update-ca-certificates --fresh
+start-fullstack: .env.local npm-install clean
+	docker-compose -f docker-compose.yml -f docker-compose.fullstack.yml up -d
 
 .env.local:
 	cp .env.dist .env.local
 
-.PHONY: add-localhost-aliases
-add-localhost-aliases:
-	echo "127.0.0.1 codelibrary.dev api.codelibrary.dev client.codelibrary.dev" | sudo tee -a /etc/hosts
-
 .PHONY: health-check
 health-check:
-	sh -c "if [ $(curl -LI http://localhost:3000/api/health-check -o /dev/null -w '%{http_code}\n' -s) == \"200\" ]; then exit 0; fi; exit 1"
+	@./bin/health-check.sh
 
 .PHONY: clean
 clean:
 	docker-compose down --remove-orphans
 
-.PHONY: npm_install
-npm_install:
-	docker-compose -f docker-compose.helpers.yml run --rm npm install $(package) $(flags)
+.PHONY: npm-install
+npm-install:
+	@./bin/install-dependencies.sh

Makefile

@@ -1,7 +1,9 @@
 #!/bin/sh
 
 if [ $(curl -LI http://localhost:3000/api/health-check -o /dev/null -w '%{http_code}\n' -s) == "200" ];
-    then exit 0;
+    echo "Everything looks fine!"
+    then exit 0
 fi;
 
+echo "Something went wrong!"
 exit 1

docker/health-check.sh renamed to bin/health-check.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ ! -d "./node_modules/" ]; then
+    echo "Will start the installation of dependencies..."
+    npm install
+    exit $?
+fi
+
+echo "Dependencies already installed!"
+exit 0

bin/install-dependencies.sh

@@ -1,41 +1,6 @@
 version: '3'
 
 services:
-  proxy:
-    image: caddy:latest
-    container_name: app_proxy
-    volumes:
-      - ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile
-      - ./docker/openssl/certs:/etc/caddy/certs
-    networks:
-      codelibrary_network:
-        aliases:
-          - 'api.codelibrary.dev'
-          - 'client.codelibrary.dev'
-    extra_hosts:
-      - 'api.codelibrary.dev:127.0.0.1'
-      - 'client.codelibrary.dev:127.0.0.1'
-    ports:
-      - '80:80'
-      - '443:443'
-  client:
-    build:
-      context: .
-      target: development
-    restart: always
-    container_name: app_client
-    volumes:
-      - .:/app
-    ports:
-      - 3000:3000
-    networks:
-      - codelibrary_network
-    depends_on:
-      - api
-    environment:
-      - APP_ENV=docker
-    env_file:
-      - .env.local
   mongo:
     image: mongo
     container_name: app_db
@@ -53,7 +18,6 @@ services:
       - 4000:4000
     env_file:
       - .env.local
-      - .env.backend
     depends_on:
       - mongo