diff --git a/.github/workflows/develop_test.yml b/.github/workflows/develop_test.yml index f1d31b7..c5c726c 100644 --- a/.github/workflows/develop_test.yml +++ b/.github/workflows/develop_test.yml @@ -32,6 +32,7 @@ jobs: echo MONGODB_URI_DEV=${{ secrets.MONGODB_URI_DEV }} >> .env echo MONGODB_URI_PROD=${{ secrets.MONGODB_URI_PROD }} >> .env echo PORT=${{ secrets.PORT }} >> .env + echo DEV_PORT=${{ secret.DEV_PORT }} >> .env echo DOCKERFILE=Dockerfile.dev >> .env cat .env @@ -76,8 +77,7 @@ jobs: key: ${{ secrets.REMOTE_SSH_KEY }} port: ${{ secrets.REMOTE_SSH_PORT }} script: | - sudo su - /opt/havit/docker/deploy.sh dev + sudo /opt/havit/docker/deploy.sh dev - name: action-slack uses: 8398a7/action-slack@v3 diff --git a/Dockerfile.dev b/Dockerfile.dev index 9d1ae1e..0109ae0 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -12,6 +12,6 @@ RUN yarn ADD . . -EXPOSE 8081 +EXPOSE 8080 ENTRYPOINT ["cross-env", "NODE_ENV=development", "node", "dist"] diff --git a/src/index.ts b/src/index.ts index 9a48cea..4f6547b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -20,8 +20,11 @@ app.use(function (err, req, res, next) { res.render('error'); }); +const port = + process.env.NODE_ENV === 'dev' ? process.env.DEV_PORT : process.env.PORT; + app - .listen(process.env.PORT, () => { + .listen(port, () => { console.log(` ################################################ 🛡️ Server listening on port 🛡️