[add] Entry Badge of GitHub codespaces & GitPod.io

[fix] some detail bugs of Deployment configuration

Author: TechQuery

.dockerignore

@@ -1,6 +1,7 @@
 README.md
 *.example
 node_modules/
+.data/
 .editorconfig
 .eslintrc.json
 Dockerfile

.env.example

@@ -1,8 +1,7 @@
-HOST=0.0.0.0
-PORT=1337
 APP_KEYS="toBeModified1,toBeModified2"
 API_TOKEN_SALT=tobemodified
-ADMIN_JWT_SECRET=tobemodified
 TRANSFER_TOKEN_SALT=tobemodified
 JWT_SECRET=tobemodified
+ADMIN_JWT_SECRET=tobemodified
+
 DATABASE_URL=postgres://user:password@host:port/database

.github/workflows/deploy-production.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Pick Docker Compose
         run: |
           mkdir ./build
-          mv ${{ env.ARTIFACT_PATH }} ./docker-compose.yml ./start.sh ./build
+          mv ${{ env.ARTIFACT_PATH }} .env ./docker-compose.yml ./start.sh ./build
 
       - name: Transport Image
         uses: garygrossgarten/github-action-scp@release
@@ -61,7 +61,7 @@ jobs:
           command: |
             cd /tmp/${{ env.BOX_NAME }}
             mkdir -p ~/${{ env.BOX_NAME }}
-            mv docker-compose.yml start.sh ~/${{ env.BOX_NAME }}
+            mv .env docker-compose.yml start.sh ~/${{ env.BOX_NAME }}
             cd ~/${{ env.BOX_NAME }}
             chmod +x start.sh
             echo '${{ secrets.SSH_KEY }}' | sudo -S ./start.sh /tmp/${{ env.BOX_NAME }}/${{ env.ARTIFACT_PATH }}

.gitignore

@@ -70,6 +70,7 @@ $RECYCLE.BIN/
 *.sql
 *.sqlite
 *.sqlite3
+.data/
 
 
 ############################

README.md

@@ -2,38 +2,40 @@
 
 Strapi comes with a full featured [Command Line Interface][1] (CLI) which lets you scaffold and manage your project in seconds.
 
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)][2]
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)][3]
+[![Deploy to Production environment](https://github.com/idea2app/Strapi-PNPM-Docker-ts/actions/workflows/deploy-production.yml/badge.svg)][2]
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)][3]
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)][4]
 
 ## 🎮 Stack
 
-- Programming Language: [TypeScript][4] v5+
-- Package Manager: [PNPM][5] v7+
-- Headless CMS: [Strapi][6] v4+
-- API specification: [Swagger][7]
-- Deployment Engine: [Docker][8]
-- CI/CD platform: [GitHub actions][9]
+- Programming Language: [TypeScript][5] v5+
+- Package Manager: [PNPM][6] v7+
+- Headless CMS: [Strapi][7] v4+
+- API specification: [Swagger][8]
+- Deployment Engine: [Docker][9]
+- CI/CD platform: [GitHub actions][10]
 
 ## 🔌 Pre-installed plugins
 
 ### Back-end
 
-1.  [Content Type explorer][10]
-2.  [Data transformer][11]
-3.  [Swagger document][12]
+1.  [Content Type explorer][11]
+2.  [Data transformer][12]
+3.  [Swagger document][13]
 
 ### Front-end
 
-1.  [Color picker][13]
-2.  [Multiple selector][14]
-3.  [React Icons picker][15]
-4.  [CKEditor 5][16]
+1.  [Color picker][14]
+2.  [Multiple selector][15]
+3.  [React Icons picker][16]
+4.  [CKEditor 5][17]
 
 ## 🚀 Scripts
 
 ### `develop`
 
-Start your Strapi application with autoReload enabled. [Learn more][17]
+Start your Strapi application with autoReload enabled. [Learn more][18]
 
 ```shell
 npm i pnpm -g
@@ -43,15 +45,15 @@ pnpm develop
 
 ### `start`
 
-Start your Strapi application with autoReload disabled. [Learn more][18]
+Start your Strapi application with autoReload disabled. [Learn more][19]
 
 ```shell
 npm start
 ```
 
 ### `build`
 
-Build your admin panel. [Learn more][19]
+Build your admin panel. [Learn more][20]
 
 ```shell
 pnpm build
@@ -75,56 +77,57 @@ pnpm container
 
 ## ⚙️ Deployment
 
-Strapi gives you many possible deployment options for your project including [Strapi Cloud][20]. Browse the [deployment section of the documentation][21] to find the best solution for your use case.
+Strapi gives you many possible deployment options for your project including [Strapi Cloud][21]. Browse the [deployment section of the documentation][22] to find the best solution for your use case.
 
 ## 📚 Learn more
 
-- [Resource center][22] - Strapi resource center.
-- [Strapi documentation][23] - Official Strapi documentation.
-- [Strapi tutorials][24] - List of tutorials made by the core team and the community.
-- [Strapi blog][25] - Official Strapi blog containing articles made by the Strapi team and the community.
-- [Changelog][26] - Find out about the Strapi product updates, new features and general improvements.
+- [Resource center][23] - Strapi resource center.
+- [Strapi documentation][24] - Official Strapi documentation.
+- [Strapi tutorials][25] - List of tutorials made by the core team and the community.
+- [Strapi blog][26] - Official Strapi blog containing articles made by the Strapi team and the community.
+- [Changelog][27] - Find out about the Strapi product updates, new features and general improvements.
 
-Feel free to check out the [Strapi GitHub repository][27]. Your feedback and contributions are welcome!
+Feel free to check out the [Strapi GitHub repository][28]. Your feedback and contributions are welcome!
 
 ## ✨ Community
 
-- [Discord][28] - Come chat with the Strapi community including the core team.
-- [Forum][29] - Place to discuss, ask questions and find answers, show your Strapi project and get feedback or just talk with other Community members.
-- [Awesome Strapi][30] - A curated list of awesome things related to Strapi.
+- [Discord][29] - Come chat with the Strapi community including the core team.
+- [Forum][30] - Place to discuss, ask questions and find answers, show your Strapi project and get feedback or just talk with other Community members.
+- [Awesome Strapi][31] - A curated list of awesome things related to Strapi.
 
 ---
 
-🤫 Psst! [Strapi is hiring][31].
+🤫 Psst! [Strapi is hiring][32].
 
 [1]: https://docs.strapi.io/dev-docs/cli
-[2]: https://codespaces.new/idea2app/Strapi-PNPM-Docker-ts
-[3]: https://gitpod.io/?autostart=true#https://github.com/idea2app/Strapi-PNPM-Docker-ts
-[4]: https://www.typescriptlang.org/
-[5]: https://pnpm.io/
-[6]: https://strapi.io/
-[7]: https://swagger.io/
-[8]: https://www.docker.com/
-[9]: https://github.com/features/actions
-[10]: https://github.com/shahriarkh/strapi-content-type-explorer
-[11]: https://github.com/ComfortablyCoding/strapi-plugin-transformer
-[12]: https://github.com/strapi/strapi/tree/develop/packages/plugins/documentation
-[13]: https://github.com/strapi/strapi/tree/develop/packages/plugins/color-picker
-[14]: https://github.com/Zaydme/strapi-plugin-multi-select
-[15]: https://github.com/DanielPantle/strapi-plugin-react-icons
-[16]: https://github.com/ckeditor/strapi-plugin-ckeditor
-[17]: https://docs.strapi.io/dev-docs/cli#strapi-develop
-[18]: https://docs.strapi.io/dev-docs/cli#strapi-start
-[19]: https://docs.strapi.io/dev-docs/cli#strapi-build
-[20]: https://cloud.strapi.io/
-[21]: https://docs.strapi.io/dev-docs/deployment
-[22]: https://strapi.io/resource-center
-[23]: https://docs.strapi.io/
-[24]: https://strapi.io/tutorials
-[25]: https://strapi.io/blog
-[26]: https://strapi.io/changelog
-[27]: https://github.com/strapi/strapi
-[28]: https://discord.strapi.io/
-[29]: https://forum.strapi.io/
-[30]: https://github.com/strapi/awesome-strapi
-[31]: https://strapi.io/careers
+[2]: https://github.com/idea2app/Strapi-PNPM-Docker-ts/actions/workflows/deploy-production.yml
+[3]: https://codespaces.new/idea2app/Strapi-PNPM-Docker-ts
+[4]: https://gitpod.io/?autostart=true#https://github.com/idea2app/Strapi-PNPM-Docker-ts
+[5]: https://www.typescriptlang.org/
+[6]: https://pnpm.io/
+[7]: https://strapi.io/
+[8]: https://swagger.io/
+[9]: https://www.docker.com/
+[10]: https://github.com/features/actions
+[11]: https://github.com/shahriarkh/strapi-content-type-explorer
+[12]: https://github.com/ComfortablyCoding/strapi-plugin-transformer
+[13]: https://github.com/strapi/strapi/tree/develop/packages/plugins/documentation
+[14]: https://github.com/strapi/strapi/tree/develop/packages/plugins/color-picker
+[15]: https://github.com/Zaydme/strapi-plugin-multi-select
+[16]: https://github.com/DanielPantle/strapi-plugin-react-icons
+[17]: https://github.com/ckeditor/strapi-plugin-ckeditor
+[18]: https://docs.strapi.io/dev-docs/cli#strapi-develop
+[19]: https://docs.strapi.io/dev-docs/cli#strapi-start
+[20]: https://docs.strapi.io/dev-docs/cli#strapi-build
+[21]: https://cloud.strapi.io/
+[22]: https://docs.strapi.io/dev-docs/deployment
+[23]: https://strapi.io/resource-center
+[24]: https://docs.strapi.io/
+[25]: https://strapi.io/tutorials
+[26]: https://strapi.io/blog
+[27]: https://strapi.io/changelog
+[28]: https://github.com/strapi/strapi
+[29]: https://discord.strapi.io/
+[30]: https://forum.strapi.io/
+[31]: https://github.com/strapi/awesome-strapi
+[32]: https://strapi.io/careers

config/database.ts

@@ -24,20 +24,23 @@ export default ({ env }) => {
 
   const connections = {
     mysql: {
-      connection: { ...connection, port: port || 3306, connectionString },
+      connection: connectionString
+        ? { connectionString }
+        : { ...connection, port: port || 3306 },
       pool,
     },
     mysql2: {
       connection: { ...connection, port: port || 3306 },
       pool,
     },
     postgres: {
-      connection: {
-        ...connection,
-        port: port || 5432,
-        connectionString,
-        schema: env('DATABASE_SCHEMA', 'public'),
-      },
+      connection: connectionString
+        ? { connectionString, schema: env('DATABASE_SCHEMA', 'public') }
+        : {
+            ...connection,
+            port: port || 5432,
+            schema: env('DATABASE_SCHEMA', 'public'),
+          },
       pool,
     },
     sqlite: {

docker-compose.yml

@@ -7,18 +7,16 @@ services:
       - POSTGRES_PASSWORD=${ADMIN_JWT_SECRET}
     volumes:
       - ./data:/var/lib/postgresql/data/
-    ports:
-      - 5432:5432
     restart: always
 
   strapi-server:
     depends_on:
       - postgres-server
     image: idea2app/strapi-server
     environment:
+      - DATABASE_CLIENT=postgres
       - DATABASE_URL=postgres://postgres:${ADMIN_JWT_SECRET}@postgres-server:5432/postgres
       - NODE_ENV=production
-      - PORT=1337
     ports:
       - 1337:1337
     healthcheck:
@@ -29,10 +27,6 @@ services:
     labels:
       - autoheal=true
     restart: always
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
 
   autoheal:
     image: willfarrell/autoheal:1.2.0

package.json

@@ -41,14 +41,14 @@
     "*.{md,json,yml,js,mjs,ts,tsx}": "prettier --write"
   },
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky install  ||  true",
     "test": "lint-staged",
     "strapi": "strapi",
     "clean": "rm -rf .cache/ .strapi/ dist/",
     "develop": "npm run clean  &&  strapi build  &&  strapi develop",
     "build": "npm run clean  &&  cross-env NODE_ENV=production  strapi build",
     "start": "cross-env NODE_ENV=production  strapi start",
-    "pack-image": "docker build -t strapi-server:latest .",
-    "container": "(docker rm -f strapi-server || true)  &&  docker run --name strapi-server -p 1337:1337 -d strapi-server:latest"
+    "pack-image": "docker build -t idea2app/strapi-server:latest .",
+    "container": "docker rm -f strapi-server  &&  docker run --name strapi-server -p 1337:1337 -d idea2app/strapi-server:latest"
   }
 }