Merge pull request #20 from gdevenyi/fix-docker-compose

Fix docker-compose

README.md

@@ -17,7 +17,7 @@
 <p align="center">
     <a href="https://worklenz.com" target="_blank">
       <img
-        src="https://worklenz.s3.amazonaws.com/assets/screenshots/hero.png"
+        src="https://worklenz.s3.amazonaws.com/assets/screenshots/hero-view.png"
         alt="Worklenz"
         width="1200"
       />
@@ -59,7 +59,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/task-management/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/task-views.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/task-views-view.png"
       alt="Worklenz task views"
       width="1024"
     />
@@ -68,7 +68,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/time-tracking/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/time-tracking.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/time-tracking-view.png"
       alt="Worklenz time tracking"
       width="1024"
     />
@@ -77,7 +77,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/analytics/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/analytics.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/analytics-view.png"
       alt="Worklenz analytics"
       width="1024"
     />
@@ -86,7 +86,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/resource-management/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/scheduler.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/schedule-view.png"
       alt="Worklenz scheduler"
       width="1024"
     />
@@ -95,7 +95,7 @@ This repository contains the frontend and backend code for Worklenz.
 <p align="center">
   <a href="https://worklenz.com/features/templates/" target="_blank">
     <img
-      src="https://worklenz.s3.amazonaws.com/assets/screenshots/templates.png"
+      src="https://worklenz.s3.amazonaws.com/assets/screenshots/templates-view.png"
       alt="Worklenz templates"
       width="1024"
     />

docker-compose.yml

@@ -0,0 +1,72 @@
+services:
+  frontend:
+    build:
+      context: ./worklenz-frontend
+      dockerfile: Dockerfile
+    container_name: worklenz_frontend
+    ports:
+      - "4200:4200"
+    depends_on:
+      backend:
+        condition: service_started
+
+  backend:
+    build:
+      context: ./worklenz-backend
+      dockerfile: Dockerfile
+    container_name: worklenz_backend
+    ports:
+      - "3000:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - ANGULAR_DIST_DIR
+      - ANGULAR_SRC_DIR
+      - AWS_REGION
+      - BACKEND_PUBLIC_DIR
+      - BACKEND_VIEWS_DIR
+      - COMMIT_BUILD_IMMEDIATELY
+      - COOKIE_SECRET
+      - DB_HOST
+      - DB_MAX_CLIENTS
+      - DB_NAME
+      - DB_PASSWORD
+      - DB_PORT
+      - DB_USER
+      - GOOGLE_CALLBACK_URL
+      - GOOGLE_CLIENT_ID
+      - GOOGLE_CLIENT_SECRET
+      - HOSTNAME
+      - LOGIN_FAILURE_REDIRECT
+      - NODE_ENV
+      - PORT
+      - SESSION_NAME
+      - SESSION_SECRET
+      - SLACK_WEBHOOK
+      - SOCKET_IO_CORS
+      - SOURCE_EMAIL
+      - USE_PG_NATIVE
+      - BUCKET
+      - REGION
+      - S3_URL
+      - S3_ACCESS_KEY_ID
+      - S3_SECRET_ACCESS_KEY
+
+  db:
+    image: postgres:15
+    container_name: worklenz_db
+    environment:
+      POSTGRES_DB: "${DB_NAME}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d ${DB_NAME} -U ${DB_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - worklenz_postgres_data:/var/lib/postgresql/data
+      - ./worklenz-backend/database/:/docker-entrypoint-initdb.d
+
+volumes:
+  worklenz_postgres_data:

worklenz-frontend/Dockerfile

@@ -8,4 +8,4 @@ RUN npm install -g @angular/cli
 
 RUN npm install
 
-CMD ["npm", "start"]
+CMD ["npm", "run", "start-docker"]

worklenz-frontend/package.json

@@ -4,6 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.config.json --disable-host-check",
+    "start-docker": "ng serve --proxy-config proxy-docker.config.json --disable-host-check --host 0.0.0.0",
     "build": "ng build --extract-licenses --common-chunk --delete-output-path --output-hashing=all",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",

worklenz-frontend/proxy-docker.config.json

@@ -0,0 +1,24 @@
+{
+  "/api": {
+    "target": "http://backend:3000/",
+    "headers": {
+      "language": "en",
+      "Accept": "application/json",
+      "Content-Type": "application/json; charset=utf-8"
+    },
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/secure": {
+    "target": "http://backend:3000/",
+    "headers": {
+      "language": "en",
+      "Accept": "application/json",
+      "Content-Type": "application/json; charset=utf-8"
+    },
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  }
+}