Clean up and comment

Author: satvikpendem

Dockerfile

@@ -9,9 +9,12 @@ RUN apt-get update -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
+# ENVIRONMENT equaling `production` is required for sqlx to run offline and migrate properly
 ENV ENVIRONMENT production
 COPY ./target/release/zero2prod .
+# Configuration files are copied over but will be overwritten by environment variables injected from the PaaS or server
 COPY ./configuration ./configuration
+COPY ./migrations ./migrations
 ENTRYPOINT ["./zero2prod"]
 EXPOSE 8080
 

Dockerfile.dev

@@ -9,8 +9,10 @@ RUN apt-get update -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
+# ENVIRONMENT equaling `production` is required for sqlx to run offline and migrate properly
 ENV ENVIRONMENT production
 COPY ./target/debug/zero2prod .
 COPY ./configuration ./configuration
+COPY ./migrations ./migrations
 ENTRYPOINT ["./zero2prod"]
 EXPOSE 8080

scripts/run.sh

@@ -5,23 +5,21 @@ parent_path=$(
 )
 cd "$parent_path"
 
-NAME=zero2prod
-PORT=8080
-
 ./build.sh $1
 
+docker compose up
+# docker compose logs -f --no-log-prefix api | bunyan
+# docker compose logs -f database
+
+### Non Docker Compose version
+
+# NAME=zero2prod
+# PORT=8080
+
 # # Remove previous containers by getting the container id then stopping it
 # CONTAINER_ID=$(docker ps -a -q --filter ancestor=$NAME --format="{{.ID}}")
 
 # # If CONTAINER_ID is set, then stop it, otherwise don't do anything
 # if [[ $CONTAINER_ID ]]; then
 #     docker stop $CONTAINER_ID
 # fi
-
-# Docker compose version of above, stopping containers
-# docker compose down --remove-orphans
-
-# Run containers
-docker compose up
-# docker compose logs -f --no-log-prefix api | bunyan
-# docker compose logs -f database

src/routes/subscriptions.rs

@@ -28,7 +28,7 @@ pub async fn subscribe(form: Form<FormData>, pool: Data<PgPool>) -> HttpResponse
     if (insert_subscriber(&form, &pool).await).is_ok() {
         HttpResponse::Ok().finish()
     } else {
-        HttpResponse::InternalServerError().body("Email already exists")
+        HttpResponse::InternalServerError().body("Database Error")
     }
 }