node is gay, alok is gay for using node

.gitignore

@@ -0,0 +1,5 @@
+public/
+test/
+data/
+.env
+db/

Dockerfile

@@ -16,16 +16,29 @@ RUN apt install git ca-certificates lsb-release apt-transport-https wget curl na
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
  && locale-gen
 
-#Get the repos
-RUN git clone https://git.shihaam.dev/shihaam/okiba-org-frontend \
- && git clone https://git.shihaam.dev/shihaam/okiba-org-backend \
+
+#Install nginx, node and pnpm
+RUN apt install nginx -y --no-install-recommends \
  && curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash \
  && curl -fsSL https://get.pnpm.io/install.sh | bash \
  && source ~/.profile && source ~/.bashrc \
- && nvm install node \
+ && nvm install node
+
+# Clone repos
+RUN git clone https://git.shihaam.dev/shihaam/okiba-org-frontend \
+ && git clone https://git.shihaam.dev/shihaam/okiba-org-backend
+
+# configure backend
+RUN source ~/.profile && source ~/.bashrc \
  && cd /root/okiba-org-backend ; pnpm build \
- && wget -O words.txt https://raw.githubusercontent.com/dwyl/english-words/master/words_alpha.txt \
- && cd /root/okiba-org-frontend ; pnpm install ; pnpm run build
+ && wget -O words.txt https://raw.githubusercontent.com/dwyl/english-words/master/words_alpha.txt
+
+# configure frontend
+COPY buildfiles/frontend-env /root/okiba-org-frontend/.env.local
+RUN source ~/.profile && source ~/.bashrc \
+ && cd /root/okiba-org-frontend ; pnpm install ; pnpm build ; cd - \
+ && mv /root/okiba-org-frontend/dist/* /var/www/html/ \
+ && rm -rfv /root/okiba-org-frontend/ /var/www/html/index.nginx-debian.html
 
 # Copy Start Services
 COPY buildfiles/start_services.sh .

README.md

@@ -0,0 +1,47 @@
+## Okiba Docker
+
+
+# Getting started
+-  save the follwing content as `docker-compose.yml`
+```yml
+services:
+#########################
+   okiba:
+      hostname: okiba
+      image: git.shihaam.dev/dockerfiles/okiba
+      volumes:
+          - $PWD/backend-env:/root/okiba-org-backend/.env
+          - $PWD/logs/npm:/root/.npm/_logs/
+          - $PWD/logs/nginx:/var/log/nginx/
+          - $PWD/data/:/root/okiba-org-backend/data
+      ports:
+          - 3000:80
+          - 8080:8080
+      restart: always
+#########################
+   postgres:
+      hostname: okiba-db
+      image: postgres:13-alpine
+      volumes:
+          - $PWD/db:/var/lib/postgresql/data
+      environment:
+          - POSTGRES_DB=okiba
+          - POSTGRES_USER=okiba
+          - POSTGRES_PASSWORD=okiba
+      restart: unless-stopped
+
+```
+- Make a new file called `backend-env` and configure it for backend process, here is a sample file:
+```env
+PORT = 8080
+PGHOST = okiba-db
+PGPORT = 5432
+PGUSER = okiba
+PGDATABASE = okiba
+PGPASSWORD = okiba
+```
+- Make a new file called `frontend-env` and configure it for frontend process, here is a sample file:
+```env
+VITE_SERVER_URL=http://localhost:8080
+```
+- Run `docker compose up`

buildfiles/frontend-env

@@ -0,0 +1 @@
+VITE_SERVER_URL=https://okiba.alk.pw

buildfiles/start_services.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
-#Start backend
-cd /root/okiba-org-frontend; pnpm start &
+source $HOME/.profile; source $HOME/.bashrc
 
 #Start frontend
-cd /root/okiba-org-backend;  pnpm run dev &
+/usr/sbin/nginx -g 'daemon off; master_process on;' &
+
+#Start backend
+cd /root/okiba-org-backend; pnpm start &
 
 # Wait for any process to exit
 wait -n

docker-compose.yml

@@ -1,11 +1,5 @@
 services:
 #########################
-   okiba-org:
+   okiba:
       build: .
-      hostname: okiba-org
-      image: git.shihaam.dev/dockerfiles/okiba-org-docker
-      volumes:
-          - $PWD/logs/npm:/root/.npm/_logs/
-#      ports:
-#         - 1111:80
-      restart: always
+      image: git.shihaam.dev/dockerfiles/okiba