Docs: Fixed Deployment Scripts (frain-dev#1411)

subomi · web-flow · commit 4578d64b294b · 2023-03-02T11:11:18.000Z
* docs: added local docker files

* docs: added local config

* fix: fixed on-prem linux script

* [skip ci] fix: on-prem script

* [skip ci] fix: fixed docker compose
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,8 @@
 **/node_modules
 node_modules
 docker-compose.yml
+
+# Convoy Specific
+typesense_data
+postgres_data
+redis_data
diff --git a/.gitignore b/.gitignore
@@ -33,5 +33,7 @@ convoy
 convoy.json
 docker-compose.yml
 compose.yml
-typesense-data
+typesense_data
+postgres_data
+redis_data
 /.run/go test github.com_frain-dev_convoy_server.run.xml
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -13,6 +13,7 @@ COPY ./go.mod /go/src/frain-dev/convoy
 COPY ./go.sum /go/src/frain-dev/convoy
 
 COPY --from=node-env /app/dist /go/src/frain-dev/convoy/server/ui/build
+
 # Get dependancies - will also be cached if we don't change mod/sum
 RUN go mod download
 RUN go mod verify
@@ -23,11 +24,12 @@ COPY . .
 RUN CGO_ENABLED=0
 RUN go install ./cmd
 
-FROM gcr.io/distroless/base
+FROM alpine:3.16.2
 COPY --from=build-env /go/bin/cmd /
 COPY --from=build-env /go/src/frain-dev/convoy/internal/email/templates/* templates/
+COPY --from=build-env /go/src/frain-dev/convoy/configs/local/start.sh /
 
-ENTRYPOINT ["/cmd"]
-CMD [ "server", "--config", "convoy.json" ]
+RUN chmod +x /cmd
+RUN apk add --no-cache gcompat 
 
 EXPOSE 8080
diff --git a/configs/convoy.templ.json b/configs/convoy.templ.json
@@ -1,8 +1,7 @@
 {
-    "environment": "dev",
     "database": {
-        "type": "mongodb",
-        "dsn": "mongodb://mongo1:27017,mongo2:27017,mongo3:27017/convoy?replicaSet=myReplicaSet&readPreference=primary&ssl=false"
+	    "type": "postgres",
+	    "dsn": "postgres://convoy:convoy@postgres/convoy?sslmode=disabled"
     },
     "queue": {
         "type": "redis",
diff --git a/configs/docker-compose.templ.yml b/configs/docker-compose.templ.yml
@@ -3,109 +3,55 @@ version: "3"
 services:
     web:
         image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:$VERSION
-        entrypoint: [ "/bin/sh" ]
-        command: /compose/start
+        command: [ "/start.sh" ]
         hostname: web
         container_name: web
         volumes:
             - ./convoy.json:/convoy.json
-            - ./compose:/compose
         restart: on-failure
         depends_on:
-            - mongo1
-            - mongo2
-            - mongo3
+            - postgres
             - redis_server
             - typesense
         networks:
             - backendCluster
 
     scheduler:
         image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:$VERSION
-        entrypoint: ["./cmd", "scheduler", "--config", "convoy.json"]
+        command: ["./cmd", "scheduler", "--config", "convoy.json"]
         volumes:
             - ./convoy.json:/convoy.json
         restart: on-failure
         depends_on:
-            - mongo1
+            - postgres
             - redis_server
         networks:
             - backendCluster
 
     worker:
         image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:$VERSION
-        entrypoint: ["./cmd", "worker", "--config", "convoy.json"]
+        command: ["./cmd", "worker", "--config", "convoy.json"]
         volumes:
             - ./convoy.json:/convoy.json
         restart: on-failure
         depends_on:
-            - mongo1
+            - postgres
             - redis_server
         networks:
             - backendCluster
 
-    mongo1:
-        image: mongo:latest
-        hostname: mongo1
-        container_name: mongo1
-        restart: always
-        entrypoint:
-            [
-                "/usr/bin/mongod",
-                "--bind_ip",
-                "localhost,mongo1",
-                "--replSet",
-                "myReplicaSet",
-                "--journal",
-                "--dbpath",
-                "/data/db",
-            ]
-        volumes:
-            - ./mongo1-data:/data/db
-        networks:
-            - backendCluster
-
-    mongo2:
-        image: mongo:latest
-        hostname: mongo2
-        container_name: mongo2
-        restart: always
-        entrypoint:
-            [
-                "/usr/bin/mongod",
-                "--bind_ip",
-                "localhost,mongo2",
-                "--replSet",
-                "myReplicaSet",
-                "--journal",
-                "--dbpath",
-                "/data/db",
-            ]
-        volumes:
-            - ./mongo2-data:/data/db
-        networks:
-            - backendCluster
-
-    mongo3:
-        image: mongo:latest
-        hostname: mongo3
-        container_name: mongo3
-        restart: always
-        entrypoint:
-            [
-                "/usr/bin/mongod",
-                "--bind_ip",
-                "localhost,mongo3",
-                "--replSet",
-                "myReplicaSet",
-                "--journal",
-                "--dbpath",
-                "/data/db",
-            ]
-        volumes:
-            - ./mongo3-data:/data/db
-        networks:
-            - backendCluster
+    postgres:
+      image: postgres:15.2-alpine
+      restart: unless-stopped
+      environment:
+        POSTGRES_DB: convoy
+        POSTGRES_USER: convoy
+        POSTGRES_PASSWORD: convoy
+        PGDATA: /data/postgres
+      volumes:
+        - ./postgres_data:/data/postgres
+      networks:
+        - backendCluster
 
     redis_server:
         image: redis:alpine
diff --git a/configs/local/convoy.json b/configs/local/convoy.json
@@ -1,8 +1,7 @@
 {
-    "environment": "dev",
     "database": {
-        "type": "mongodb",
-	"dsn": "mongodb://mongo:27017/convoy?replicaSet=localhost"
+        "type": "postgres",
+	"dsn": "postgres://convoy:convoy@postgres/convoy?sslmode=disable"
     },
     "queue": {
         "type": "redis",
diff --git a/configs/local/docker-compose.yml b/configs/local/docker-compose.yml
@@ -2,56 +2,56 @@ version: "3"
 
 services:
     web:
-        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.8.2
+        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.9.0-rc.1
+        command: ["/start.sh"]
         volumes:
             - ./convoy.json:/convoy.json
         restart: on-failure
         ports:
           - "5005:5005"
         depends_on:
-            - mongo
+            - postgres
             - redis_server
             - typesense
 
     scheduler:
-        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.8.2
-        entrypoint: ["./cmd", "scheduler", "--config", "convoy.json"]
+        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.9.0-rc.1
+        command: ["./cmd", "scheduler", "--config", "convoy.json"]
         volumes:
             - ./convoy.json:/convoy.json
         restart: on-failure
         depends_on:
-            - mongo
+            - postgres
             - redis_server
+            - typesense
 
     worker:
-        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.8.2
-        entrypoint: ["./cmd", "worker", "--config", "convoy.json"]
+        image: docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.9.0-rc.1
+        command: ["./cmd", "worker", "--config", "convoy.json"]
         volumes:
             - ./convoy.json:/convoy.json
         restart: on-failure
         depends_on:
-            - mongo
+            - postgres
             - redis_server
+            - typesense
 
-    mongo:
-      image: mongo:5.0.14
-      command: "--replSet localhost"
-      restart: always
-      ports:
-        - "27017:27017"
-        - "27018:27018"
-        - "27019:27019"
-
-    mongosetup:
-        image: mongo:5.0.14
-        depends_on:
-          - mongo
-        restart: "no"
-        entrypoint: [ "bash", "-c", "sleep 10 && mongo --host mongo:27017 --eval 'rs.initiate()'"]
+    postgres:
+      image: postgres:15.2-alpine
+      restart: unless-stopped
+      environment:
+        POSTGRES_DB: convoy
+        POSTGRES_USER: convoy
+        POSTGRES_PASSWORD: convoy
+        PGDATA: /data/postgres
+      volumes:
+        - ./postgres_data:/data/postgres
 
     redis_server:
         image: redis:alpine
         restart: always
+        volumes:
+          - ./redis_data:/data
 
     typesense:
         image: typesense/typesense:0.22.2
@@ -61,5 +61,5 @@ services:
             TYPESENSE_ENABLE_CORS: "true"
             TYPESENSE_API_KEY: "convoy"
         volumes:
-            - ./typesense-data:/data/typesense
+            - ./typesense_data:/data/typesense
 
diff --git a/deploy/vm-deploy.sh b/deploy/vm-deploy.sh
@@ -136,27 +136,6 @@ EOF
 	# rewrite docker compose
 	envsubst < docker-compose.templ.yml > docker-compose.yml
 	rm docker-compose.templ.yml
-
-	# Fix compose start command
-	cat > $COMPOSECONFDIR/start <<EOF
-#!/bin/bash
-./cmd migrate up
-./cmd server --config convoy.json -w false
-EOF
-chmod +x $COMPOSECONFDIR/start
-}
-
-# setup replica set on mongo db clusters
-setup_replica_set() {
-	echo
-	docker exec mongo1 mongosh --eval "rs.initiate({
-   _id: \"myReplicaSet\",
-   members: [
-     {_id: 0, host: \"mongo1\"},
-     {_id: 1, host: \"mongo2\"},
-     {_id: 2, host: \"mongo3\"}
-   ]
-	})"
 }
 
 # start system
@@ -221,9 +200,6 @@ start() {
 	# start containers
 	start_containers
 
-	# setup replica set
-	setup_replica_set
-
 	# check if services are up
 	check_if_containers_are_up
 }
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,74 @@
+version: "3"
+
+volumes:
+  postgres_data:
+  redis_data:
+  typesense_data:
+
+services:
+    web:
+        build:
+          context: ./
+          dockerfile: Dockerfile.dev
+        command: [ "/start.sh" ]
+        volumes:
+            - ./convoy.json:/convoy.json
+        restart: on-failure
+        ports:
+          - "5005:5005"
+        depends_on:
+            - postgres
+            - redis_server
+            - typesense
+
+    scheduler:
+        build:
+          context: ./
+          dockerfile: Dockerfile.dev
+        entrypoint: ["./cmd", "scheduler", "--config", "convoy.json"]
+        volumes:
+            - ./convoy.json:/convoy.json
+        restart: on-failure
+        depends_on:
+            - postgres
+            - redis_server
+
+    worker:
+        build:
+          context: ./
+          dockerfile: Dockerfile.dev
+        entrypoint: ["./cmd", "worker", "--config", "convoy.json"]
+        volumes:
+            - ./convoy.json:/convoy.json
+        restart: on-failure
+        depends_on:
+            - postgres
+            - redis_server
+
+    postgres:
+      image: postgres:15.2-alpine
+      restart: unless-stopped
+      environment:
+        POSTGRES_DB: convoy
+        POSTGRES_USER: convoy
+        POSTGRES_PASSWORD: convoy
+        PGDATA: /data/postgres
+      volumes:
+        - ./postgres_data:/data/postgres
+
+    redis_server:
+        image: redis:alpine
+        restart: always
+        volumes:
+          - ./redis_data:/data
+
+    typesense:
+        image: typesense/typesense:0.22.2
+        restart: always
+        environment:
+            TYPESENSE_DATA_DIR: /data/typesense
+            TYPESENSE_ENABLE_CORS: "true"
+            TYPESENSE_API_KEY: "convoy"
+        volumes:
+            - ./typesense_data:/data/typesense
+
