Skip to content

Commit

Permalink
Merge pull request #146 from HannesOberreiter/beta
Browse files Browse the repository at this point in the history
Beta
  • Loading branch information
HannesOberreiter committed Jan 22, 2024
2 parents d3eba72 + 857cc04 commit e554dd4
Show file tree
Hide file tree
Showing 11 changed files with 558 additions and 211 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: 'npm'
- name: Install packages
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://www.digitalocean.com/community/tutorials/how-to-secure-a-containerized-node-js-application-with-nginx-let-s-encrypt-and-docker-compose
# https://www.digitalocean.com/community/tutorials/how-to-build-a-node-js-application-with-docker#step-3-%E2%80%94-writing-the-dockerfile

FROM node:18-alpine
FROM node:20-alpine

# Create app directory
RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.api-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ services:
# To run knex commands
#entrypoint: [ "/bin/sh", "-c", "npm run prod:knex migrate:latest" ]
restart: always
user: "node" # connected volume logs must have write access as node user chown -R 1000:1000 logs
user: 'node' # connected volume logs must have write access as node user chown -R 1000:1000 logs
environment:
ENVIRONMENT: production
IS_CHILD: false
volumes:
- ./env:/home/node/app/env
- ./logs:/home/node/app/logs
- ./migration:/home/node/app/db/seeds/migration
ports:
- "1339:8101"
- '1339:8101'

networks:
default:
Expand Down
7 changes: 4 additions & 3 deletions docker-compose.api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ services:
# To run knex commands
#entrypoint: [ "/bin/sh", "-c", "npm run prod:knex migrate:latest" ]
restart: always
user: "node" # connected volume logs must have write access as node user chown -R 1000:1000 logs
user: 'node' # connected volume logs must have write access as node user chown -R 1000:1000 logs
environment:
ENVIRONMENT: production
IS_CHILD: false
volumes:
- ./env:/home/node/app/env
- ./logs:/home/node/app/logs
- ./migration:/home/node/app/db/seeds/migration
ports:
- "1338:8101"
- '1338:8101'

networks:
default:
external: true
name: database_btree-db-network
name: database_btree-db-network

0 comments on commit e554dd4

Please sign in to comment.