Skip to content

Commit 9a17415

Browse files
committed
Merge branch 'develop'
2 parents de6d454 + 7474f79 commit 9a17415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+7660
-11155
lines changed

.commitlintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": ["cz"]
2+
"extends": ["@commitlint/config-conventional"]
33
}

.devcontainer/Dockerfile

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
ARG VARIANT="18.14"
2+
3+
# Install dependencies only when needed
4+
FROM node:${VARIANT} AS deps
5+
LABEL author="Dmitry Neverovski <[email protected]>"
6+
7+
RUN apt-get update
8+
RUN apt-get install -y \
9+
sudo \
10+
lsb-release \
11+
curl
12+
WORKDIR /app
13+
14+
COPY package*.json ./
15+
16+
RUN npm install
17+
18+
# Production image, copy all the files and run next
19+
FROM node:${VARIANT} AS runner
20+
LABEL author="Dmitry Neverovski <[email protected]>"
21+
ARG APP_PORT
22+
ENV APP_PORT=${APP_PORT:-5858}
23+
24+
# Set `DEVCONTAINER` environment variable to help with orientation
25+
ENV DEVCONTAINER=true
26+
27+
# Ensure default `auth` user has access to `sudo`
28+
ARG USERNAME=auth
29+
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
30+
&& chmod 0440 /etc/sudoers.d/$USERNAME
31+
32+
EXPOSE ${APP_PORT}
33+
CMD npm run start:dev

.devcontainer/devcontainer.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "AUTH-SERVER",
3+
"dockerComposeFile": "docker-compose.yml",
4+
"service": "auth-server",
5+
"workspaceFolder": "/app",
6+
"customizations": {
7+
"vscode": {
8+
"extensions": ["mads-hartmann.bash-ide-vscode"]
9+
}
10+
},
11+
"runArgs": ["--env-file", ".env"],
12+
"remoteUser": "auth"
13+
}

docker-compose.yml renamed to .devcontainer/docker-compose.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
version: '3.9'
22

33
services:
4+
auth-server:
5+
image: auth-server
6+
container_name: auth-server
7+
working_dir: /app
8+
env_file: ../.env
9+
build:
10+
context: ..
11+
dockerfile: .devcontainer/Dockerfile
12+
args:
13+
APP_ENV: ${APP_ENV}
14+
APP_PORT: ${APP_PORT}
15+
volumes:
16+
- ..:/app
17+
networks:
18+
- auth-network
19+
ports:
20+
- ${APP_PORT}:${APP_PORT}
21+
422
auth-redis:
523
image: redis:7
624
container_name: auth-redis
@@ -14,7 +32,7 @@ services:
1432
image: postgres:14
1533
container_name: auth-db
1634
volumes:
17-
- ./data/postgresql/server:/var/lib/postgresql/data
35+
- ../data/postgresql/server:/var/lib/postgresql/data
1836
environment:
1937
POSTGRES_DB: ${DB_NAME}
2038
POSTGRES_USER: ${DB_USER}

.dockerignore

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
node_modules
2-
npm-debug.log
3-
Dockerfile
4-
.dockerignore
5-
logs
6-
build
7-
data
8-
storage
1+
**/.classpath
2+
**/.dockerignore
3+
**/.project
4+
**/.settings
5+
**/.toolstarget
6+
**/.vs
7+
**/*.*proj.user
8+
**/*.dbmdl
9+
**/*.jfm
10+
**/charts
11+
**/docker-compose*
12+
**/compose*
13+
**/Dockerfile*
14+
**/node_modules
15+
**/npm-debug.log
16+
**/obj
17+
**/secrets.dev.yaml
18+
**/values.dev.yaml
19+
**/storage
20+
**/logs
21+
**/build
22+
**/data
23+
**/dist

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ MAIL_PASSWORD=
4242
MAIL_ENCRYPTION=ssl
4343

4444
# SEQ
45-
SEQ_MONITORING=true
45+
SEQ_ENABLED=false
4646
SEQ_SERVER_URL=
4747
SEQ_API_KEY=
4848

.env.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ MAIL_PASSWORD=MAIL_PASSWORD
4242
MAIL_ENCRYPTION=ssl
4343

4444
# SEQ
45-
SEQ_MONITORING=false
45+
SEQ_ENABLED=false
4646
SEQ_SERVER_URL=SEQ_SERVER_URL
4747
SEQ_API_KEY=SEQ_API_KEY
4848

.eslintrc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"prettier"
1515
],
1616
"parserOptions": {
17-
"ecmaVersion": 2021,
17+
"ecmaVersion": 2022,
1818
"project": "./tsconfig.json",
1919
"tsconfigRootDir": "./"
2020
},
@@ -86,7 +86,6 @@
8686
"private-static-field",
8787
"public-abstract-field",
8888
"protected-abstract-field",
89-
"private-abstract-field",
9089
"field",
9190

9291
// Constructors
@@ -104,7 +103,6 @@
104103
"private-static-get",
105104
"public-abstract-get",
106105
"protected-abstract-get",
107-
"private-abstract-get",
108106
"get",
109107

110108
// Setters
@@ -116,7 +114,6 @@
116114
"private-static-set",
117115
"public-abstract-set",
118116
"protected-abstract-set",
119-
"private-abstract-set",
120117
"set",
121118

122119
// Methods
@@ -128,7 +125,6 @@
128125
"private-static-method",
129126
"public-abstract-method",
130127
"protected-abstract-method",
131-
"private-abstract-method",
132128
"method"
133129
],
134130
"order": "alphabetically"

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* text=auto eol=lf
2+
3+
*.js text eol=lf
4+
*.ts text eol=lf
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
How to reproduce the behaviour:
15+
1. Sample code '...'
16+
2. Input '....'
17+
3. Unit test '....'
18+
4. Thrown error
19+
20+
**Expected behaviour**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Environment (please complete the following information):**
24+
- Node.js: [e.g. 18]
25+
26+
**Additional context**
27+
Add any other context about the problem here.

0 commit comments

Comments
 (0)