From d36b5e80913b716c9481afac80061043b132f914 Mon Sep 17 00:00:00 2001
From: ksurl <ksurl@users.noreply.github.com>
Date: Mon, 21 Nov 2022 15:01:46 -0800
Subject: [PATCH 1/3] fix(docker-compose): add compose image tag (#734)

* fix: update compose image tag

* fix: update image org name
---
 docker-compose.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b9b13263..aa289ac5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,7 @@ services:
   main:
     build:
       context: ./docker
-      tags:
-        - automatisch/automatisch
+    image: automatischio/automatisch
     ports:
       - '3000:3000'
     depends_on:
@@ -27,8 +26,7 @@ services:
   worker:
     build:
       context: ./docker
-      tags:
-        - automatisch/automatisch
+    image: automatischio/automatisch
     depends_on:
       - main
     environment:

From 9ba1351a3b435c48cc74255f2d6b06cd254872cf Mon Sep 17 00:00:00 2001
From: ksurl <ksurl@users.noreply.github.com>
Date: Mon, 21 Nov 2022 16:18:05 -0800
Subject: [PATCH 2/3] refactor: use healthcheck for db, remove psql client from
 image (#737)

* refactor: use healthcheck for db, remove postgresql client from main image

* fix: redis dependency condition

* cleanup entrypoint.sh

* fix healthcheck command
---
 docker-compose.yml   | 11 +++++++++--
 docker/Dockerfile    |  1 -
 docker/entrypoint.sh |  9 ---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index aa289ac5..48c633ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,10 @@ services:
     ports:
       - '3000:3000'
     depends_on:
-      - postgres
-      - redis
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_started
     environment:
       - HOST=localhost
       - PROTOCOL=http
@@ -49,6 +51,11 @@ services:
       - POSTGRES_PASSWORD=automatisch_password
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
   redis:
     image: 'redis:7.0.4'
     volumes:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c1508952..2b3697d3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,6 @@
 FROM node:16
 WORKDIR /automatisch
 
-RUN apt-get update && apt-get install -y postgresql-client
 COPY ./entrypoint.sh /entrypoint.sh
 
 RUN yarn global add @automatisch/cli@0.2.0
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 5ac0ae56..5f1f6f24 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,13 +2,6 @@
 
 set -e
 
-export PGPASSWORD="$POSTGRES_PASSWORD"
-
-until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_DATABASE" -c '\q'; do
-  >&2 echo "Waiting for Postgres to be ready..."
-  sleep 1
-done
-
 if [ ! -f /automatisch/storage/.env ]; then
   >&2 echo "Saving environment variables"
   ENCRYPTION_KEY="${ENCRYPTION_KEY:-$(openssl rand -base64 36)}"
@@ -17,8 +10,6 @@ if [ ! -f /automatisch/storage/.env ]; then
   echo "APP_SECRET_KEY=$APP_SECRET_KEY" >> /automatisch/storage/.env
 fi
 
->&2 echo "Postgres is up - executing command"
-
 if [ -n "$WORKER" ]; then
   automatisch start-worker --env-file /automatisch/storage/.env
 else

From d3a059d759f1e61bcf3501928932b6038f2f06d2 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Tue, 22 Nov 2022 16:48:50 +0100
Subject: [PATCH 3/3] fix(docker-compose): add dos2unix

---
 docker/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b3697d3..901a1242 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,9 +2,12 @@
 FROM node:16
 WORKDIR /automatisch
 
+RUN apt-get update && apt-get install -y dos2unix
+
 COPY ./entrypoint.sh /entrypoint.sh
+RUN dos2unix /entrypoint.sh && apt-get --purge remove -y dos2unix && rm -rf /var/lib/apt/lists/*
 
 RUN yarn global add @automatisch/cli@0.2.0
 
 EXPOSE 3000
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["sh", "/entrypoint.sh"]