Merge pull request #302 from rohaizanr/api-publish

Api-publish

Author: rohaizanr

README.en.md

@@ -3,7 +3,6 @@
 ![Github issues](https://img.shields.io/github/issues/Dev4w4n/e-masjid.my)
 ![Github last-commit](https://img.shields.io/github/last-commit/Dev4w4n/e-masjid.my)
 
-
 <p align="center">
   <img src="./public-web/src/assets/home/logo.png" alt="E-Masjid.My" width="80" height="80"/>
 </p>
@@ -17,8 +16,8 @@
   <a href='https://demo.e-masjid.my'>Live Demo</a>
 </h2><br>
 
-Philosophy
-=====
+# Philosophy
+
 The main goals for this system are listed below.
 
 **Easy of use**
@@ -37,37 +36,40 @@ The main goals for this system are listed below.
 
 - We should be contributing to the Muslim community, rather than benefiting from them, especially the Masjid.
 
-
 ## Prerequisites
+
 1. GIT https://www.git-scm.com/downloads
 2. Docker Desktop https://docs.docker.com/get-docker/
 3. Node 20 https://nodejs.org/en/download
 4. Go https://go.dev/dl/
 5. VSCode https://code.visualstudio.com/download
 
 ## Minimum Requirement for System Development
+
 1. Processor: 1.6 GHz or faster 64-bit processor
 2. Memory: 8 GB RAM or higher
 
 ## Quickstart guide (Docker compose)
+
 ### Fork this repo
+
 1. Fork this repo to your personal GitHub account, example `https://github.com/<github-user>/e-masjid.my`, by pressing the Fork button on the top right part of this page.
 2. Once done, clone this repo to your computer.
+
 ```
 git clone https://github.com/<github-user>/e-masjid.my.git
 ```
+
 3. Once done, navigate to the e-masjid.my folder.
+
 ```
 cd e-masjid.my
 ```
+
 4. Follow the instructions below depending on your computer's operating system.
-### Linux
-```
-sh run-dev.sh
-```
-### Windows - Use Git Bash terminal in VSCode
+
 ```
-sh run-dev.sh
+docker compose up -d
 ```
 
 This will automatically build all the APIs, and run the docker-compose file where it will spin up 6 containers for the developments environment.
@@ -86,6 +88,5 @@ We love your input! We want to make contributing to this project as easy and tra
 - Enhancing features
 - Documentation
 - Unit testing
-  
-Or you would just like to chat with us, find us on [Discord](https://discord.gg/vz4WWM85)
 
+Or you would just like to chat with us, find us on [Discord](https://discord.gg/vz4WWM85)

README.md

@@ -18,8 +18,8 @@
   <a href='https://demo.e-masjid.my'>Demo Langsung</a>
 </h2><br>
 
-Falsafah
-=====
+# Falsafah
+
 Matlamat-matlamat utama sistem ini ialah seperti berikut.
 
 **Mudah untuk digunakan**
@@ -38,45 +38,49 @@ Matlamat-matlamat utama sistem ini ialah seperti berikut.
 
 - Kita sepatutnya menyumbang kepada komuniti Muslim, terutamanya masjid dan bukan mengambil manfaat daripada mereka.
 
-
 ## Prasyarat
+
 1. GIT https://www.git-scm.com/downloads
 2. Docker Desktop https://docs.docker.com/get-docker/
 3. Node 20 https://nodejs.org/en/download
 4. Go https://go.dev/dl/
 5. VSCode https://code.visualstudio.com/download
 
 ## Keperluan Minimum Sistem untuk tujuan Pembangunan Sistem
+
 1. Pemproses: 1.6 GHz atau lebih pantas
 2. Memori: 8 GB RAM atau lebih tinggi
 
 ## Panduan permulaan pantas (Docker compose)
+
 ### Fork repo ini
-1. *Fork* repo ini ke akaun Github anda, contoh `https://github.com/<github-user>/e-masjid.my`, dengan menekan butang *Fork* di bahagian atas sebelah kanan laman web ini.
-2. Setelah selesai *Fork*, *klon* repo ini ke komputer anda.
+
+1. _Fork_ repo ini ke akaun Github anda, contoh `https://github.com/<github-user>/e-masjid.my`, dengan menekan butang _Fork_ di bahagian atas sebelah kanan laman web ini.
+2. Setelah selesai _Fork_, _klon_ repo ini ke komputer anda.
+
 ```
 git clone https://github.com/<github-user>/e-masjid.my.git
 ```
-3. Setelah selesai *klon*, navigasi ke *folder* e-masjid.my.
+
+3. Setelah selesai _klon_, navigasi ke _folder_ e-masjid.my.
+
 ```
 cd e-masjid.my
 ```
+
 4. Ikut arahan seterusnya seperti di bawah bergantung kepada sistem pengoperasian komputer anda.
-### Linux
-```
-sh run-dev.sh
-```
-### Windows - Gunakan terminal Git Bash di VSCode
+
 ```
-sh run-dev.sh
+docker compose up -d
 ```
 
-Skrip ini akan membina semua API secara automatik dan melaksanakan arahan docker-compose yang akan menghidupkan 6 *container* untuk persekitaran pembangunan.
+Skrip ini akan membina semua API secara automatik dan melaksanakan arahan docker-compose yang akan menghidupkan 6 _container_ untuk persekitaran pembangunan.
 
-Apabila kesemua *container* telah hidup, anda boleh menghentikan mana-mana *container* yang tidak diperlukan dalam tugasan anda.
+Apabila kesemua _container_ telah hidup, anda boleh menghentikan mana-mana _container_ yang tidak diperlukan dalam tugasan anda.
 
 ## Panduan untuk menyumbang
-*Fork* repo ini dan hantar *Pull Request* anda.
+
+_Fork_ repo ini dan hantar _Pull Request_ anda.
 
 Kami mahu input anda! Kami ingin menjadikan penyumbangan kepada projek mudah dan telus, sama ada dengan:
 
@@ -86,8 +90,8 @@ Kami mahu input anda! Kami ingin menjadikan penyumbangan kepada projek mudah dan
 - Menambah baik ciri
 - Dokumentasi
 - Ujian unit
-  
-Atau anda ingin berbual dengan kami, cari kami di [Discord](https://discord.gg/k2zGpWTDpe).
 
+Atau anda ingin berbual dengan kami, cari kami di [Discord](https://discord.gg/k2zGpWTDpe).
 
 [![Contributors](https://contrib.rocks/image?repo=Dev4w4n/e-masjid.my)](https://github.com/Dev4w4n/e-masjid.my/graphs/contributors)
+

api/cadangan-api/.env.dev

@@ -23,22 +23,38 @@ RUN swag init
 FROM alpine:latest
 
 # Define build-time argument for GO_ENV
-ARG GO_ENV=local
-
-# Set Go environment variables
-ENV GO_ENV=$GO_ENV
+ENV GO_ENV="docker"
+ENV DB_HOST="postgres"
+ENV DB_PORT="5432"
+ENV DB_USER="pgsql-saas"
+ENV DB_PASSWORD="pgsql-saas"
+ENV DB_NAME="pgsql-saas"
+ENV ALLOWED_ORIGIN="*"
+ENV DEPLOY_URL="/"
+ENV SERVER_PORT="8083"
+ENV API_DOC_URL="http://localhost:4000"
 
 # Set the working directory inside the container
 WORKDIR /app
 
 # Copy only the built binary from the builder stage
 COPY --from=builder /app/cadangan-api .
-COPY --from=builder /app/.env.* .
 COPY --from=builder /app/wait-for-it.sh . 
 COPY --from=builder /app/docs ./docs
 
 # Expose the port that your application will run on
 EXPOSE 8080
 
+# Script to dynamically generate .env.docker at runtime
+COPY generate-env.sh /docker-entrypoint.d/generate-env.sh
+RUN chmod +x /docker-entrypoint.d/generate-env.sh
+
+# Copy the custom entrypoint
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Set the custom entrypoint
+ENTRYPOINT ["/entrypoint.sh"]
+
 # Command to run your application
 CMD ["./cadangan-api", "-env", "$GO_ENV"]

api/cadangan-api/.env.prod

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+# Execute scripts in /docker-entrypoint.d, if any
+if [ -d "/docker-entrypoint.d" ]; then
+    for script in /docker-entrypoint.d/*; do
+        if [ -x "$script" ]; then
+            echo "Running $script"
+            "$script"
+        else
+            echo "Skipping $script, not executable"
+        fi
+    done
+fi
+
+# Pass control to CMD
+exec "$@"

api/cadangan-api/Dockerfile

@@ -0,0 +1,16 @@
+echo "Generating .env.docker..."
+cat <<EOF > /app/.env.docker
+GO_ENV=${GO_ENV}
+DB_HOST=${DB_HOST}
+DB_PORT=${DB_PORT}
+DB_USER=${DB_USER}
+DB_PASSWORD=${DB_PASSWORD}
+DB_NAME=${DB_NAME}
+ALLOWED_ORIGIN=${ALLOWED_ORIGIN}
+DEPLOY_URL=${DEPLOY_URL}
+SERVER_PORT=${SERVER_PORT}
+API_DOC_URL=${API_DOC_URL}
+EOF
+
+echo ".env.docker created with the following content:"
+cat /app/.env.docker

api/cadangan-api/entrypoint.sh

@@ -23,21 +23,37 @@ RUN swag init
 FROM alpine:latest
 
 # Define build-time argument for GO_ENV
-ARG GO_ENV=local
-
-# Set Go environment variables
-ENV GO_ENV=$GO_ENV
+ENV GO_ENV="docker"
+ENV DB_HOST="postgres"
+ENV DB_PORT="5432"
+ENV DB_USER="pgsql-saas"
+ENV DB_PASSWORD="pgsql-saas"
+ENV DB_NAME="pgsql-saas"
+ENV ALLOWED_ORIGIN="*"
+ENV DEPLOY_URL="/"
+ENV SERVER_PORT="8084"
+ENV API_DOC_URL="http://localhost:4000"
 
 # Set the working directory inside the container
 WORKDIR /app
 
 # Copy only the built binary from the builder stage
 COPY --from=builder /app/cadangan-public-api .
-COPY --from=builder /app/.env.* .
 COPY --from=builder /app/wait-for-it.sh . 
 
 # Expose the port that your application will run on
 EXPOSE 8080
 
+# Script to dynamically generate .env.docker at runtime
+COPY generate-env.sh /docker-entrypoint.d/generate-env.sh
+RUN chmod +x /docker-entrypoint.d/generate-env.sh
+
+# Copy the custom entrypoint
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Set the custom entrypoint
+ENTRYPOINT ["/entrypoint.sh"]
+
 # Command to run your application
 CMD ["./cadangan-public-api", "-env", "$GO_ENV"]