From e4554975965f4b9a341e0c8936fb5101d885277e Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Sun, 27 Nov 2022 01:36:00 +0100
Subject: [PATCH] refactor(docker): rework for release

---
 docker/Dockerfile    | 12 ++----------
 docker/entrypoint.sh | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2d463831..afff33c9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,18 +1,10 @@
 # syntax=docker/dockerfile:1
-
-FROM alpine
-
-COPY ./entrypoint.sh /entrypoint.sh
-
-RUN apk add --no-cache dos2unix && \
-    dos2unix /entrypoint.sh
-
 FROM node:16-alpine
 WORKDIR /automatisch
 
-COPY --from=0 /entrypoint.sh /entrypoint.sh
+COPY ./entrypoint.sh /entrypoint.sh
 
-RUN apk add --no-cache openssl && yarn global add @automatisch/cli@0.2.0
+RUN yarn global add @automatisch/cli@0.2.0
 
 EXPOSE 3000
 ENTRYPOINT ["sh", "/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 5f1f6f24..60de858c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,16 +2,8 @@
 
 set -e
 
-if [ ! -f /automatisch/storage/.env ]; then
-  >&2 echo "Saving environment variables"
-  ENCRYPTION_KEY="${ENCRYPTION_KEY:-$(openssl rand -base64 36)}"
-  APP_SECRET_KEY="${APP_SECRET_KEY:-$(openssl rand -base64 36)}"
-  echo "ENCRYPTION_KEY=$ENCRYPTION_KEY" >> /automatisch/storage/.env
-  echo "APP_SECRET_KEY=$APP_SECRET_KEY" >> /automatisch/storage/.env
-fi
-
 if [ -n "$WORKER" ]; then
-  automatisch start-worker --env-file /automatisch/storage/.env
+  automatisch start-worker
 else
-  automatisch start --env-file /automatisch/storage/.env
+  automatisch start
 fi