Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
node_modules
npm-debug.log
dist
Dockerfile*
docker-compose*
.dockerignore
.git
.github
.gitignore
README.md
LICENSE
.vscode
.nx
42 changes: 24 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Cache node_modules
uses: actions/cache@v4
with:
path: node_modules
path: '**/node_modules'
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
Expand All @@ -48,16 +48,14 @@ jobs:
with:
node-version: 20

- name: Cache node_modules
uses: actions/cache@v4
- name: Restore Cache node_modules
uses: actions/cache/restore@v4
with:
path: node_modules
path: '**/node_modules'
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Run Lint
run: npm run lint # Stelle sicher, dass du ein Lint-Skript in deinem package.json hast
run: npm run lint

build:
runs-on: ubuntu-latest
Expand All @@ -73,21 +71,25 @@ jobs:
with:
node-version: 20

- name: Cache node_modules
uses: actions/cache@v4
- name: Restore Cache node_modules
uses: actions/cache/restore@v4
with:
path: node_modules
path: '**/node_modules'
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Cache dist
uses: actions/cache/save@v4
with:
path: 'libs/*/dist'
key: ${{ runner.os }}-dist-${{ hashFiles('libs/*/dist') }}

- name: Run Build
run: npm run build

test:
runs-on: ubuntu-latest
needs:
- install
- build

steps:
- name: Checkout code
Expand All @@ -98,13 +100,17 @@ jobs:
with:
node-version: 20

- name: Cache node_modules
uses: actions/cache@v4
- name: Restore Cache node_modules
uses: actions/cache/restore@v4
with:
path: node_modules
path: '**/node_modules'
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Restore Cache dist
uses: actions/cache/restore@v4
with:
path: 'libs/*/dist'
key: ${{ runner.os }}-dist-${{ hashFiles('libs/*/dist') }}

- name: Run CI Checks
run: npm run test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.DS_Store
node_modules
/dist
dist


# local env files
Expand All @@ -16,6 +16,7 @@ pnpm-debug.log*
# Editor directories and files
.idea
.vscode
.nx
*.suo
*.ntvs*
*.njsproj
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
src
.nx
16 changes: 0 additions & 16 deletions Dockerfile

This file was deleted.

12 changes: 8 additions & 4 deletions apps/max/Dockerfile → Dockerfile-app
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# build stage
FROM node:12-alpine3.12 as build-stage
FROM node:20-alpine as build-stage

WORKDIR /app
COPY package*.json ./
COPY .npmrc ./
RUN npm install
COPY . .
RUN npm run build
RUN npm run lint && \
npm run build && \
npm run test

# production stage
FROM nginx:stable-alpine as production-stage
COPY --from=build-stage /app/dist /usr/share/nginx/html
COPY prod_nginx.conf /etc/nginx/nginx.conf
# COPY prod_nginx.conf /etc/nginx/nginx.conf
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
CMD ["nginx", "-g", "daemon off;"]
9 changes: 9 additions & 0 deletions Dockerfile-lib
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# build stage
FROM node:20-alpine as build-stage

WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build

32 changes: 32 additions & 0 deletions Dockerfile-mono
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM node:20-alpine as install-stage

WORKDIR /app
COPY . .

RUN npm ci

FROM node:20-alpine as build-stage
COPY --from=install-stage /app /app
WORKDIR /app

RUN npm run lint && \
npm run test

FROM node:20-alpine as build-stage
COPY --from=install-stage /app /app
WORKDIR /app

RUN npm run build

FROM node:20-alpine as run-stage
COPY --from=build-stage /app /app
WORKDIR /app

EXPOSE 8081
EXPOSE 8082
EXPOSE 8083
EXPOSE 8084

CMD ["npm", "start"]


18 changes: 11 additions & 7 deletions apps/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"name": "@apps/auth",
"version": "0.1.0",
"version": "1.0.1",
"private": true,
"homepage": "https://github.com/DATEV-Research/",
"author": "DATEV eG <[email protected]> (https://www.datev.de/)",
"license": "MIT",
"repository": "github:DATEV-Research/Solid-authorization-app",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand All @@ -10,12 +14,12 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@datev-research/mandat-shared-components": "^1.0.0",
"@datev-research/mandat-shared-composables": "^1.0.0",
"@datev-research/mandat-shared-utils": "^1.0.0",
"@datev-research/mandat-shared-solid-interop": "^1.0.0",
"@datev-research/mandat-shared-solid-requests": "^1.0.0",
"@datev-research/mandat-shared-theme": "^1.0.0",
"@datev-research/mandat-shared-components": "^1.0.1",
"@datev-research/mandat-shared-composables": "^1.0.1",
"@datev-research/mandat-shared-solid-interop": "^1.0.1",
"@datev-research/mandat-shared-solid-requests": "^1.0.1",
"@datev-research/mandat-shared-theme": "^1.0.1",
"@datev-research/mandat-shared-utils": "^1.0.1",
"@vueuse/components": "^11.3.0",
"@vueuse/core": "^11.3.0",
"axios": "^1.7.8",
Expand Down
10 changes: 0 additions & 10 deletions apps/lisa/.dockerignore

This file was deleted.

File renamed without changes.
14 changes: 0 additions & 14 deletions apps/lisa/Dockerfile

This file was deleted.

15 changes: 8 additions & 7 deletions apps/lisa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apps/lisa",
"version": "0.1.0",
"version": "1.0.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -15,6 +15,7 @@
"@babel/preset-env": "^7.24.0",
"@babel/preset-typescript": "^7.26.0",
"@types/jest": "^29.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/test-utils": "^2.4.4",
"@vue/vue3-jest": "^29.0.0",
"babel-jest": "^29.0.0",
Expand All @@ -23,12 +24,12 @@
"ts-jest": "^29.0.0"
},
"dependencies": {
"@datev-research/mandat-shared-components": "^1.0.0",
"@datev-research/mandat-shared-composables": "^1.0.0",
"@datev-research/mandat-shared-utils": "^1.0.0",
"@datev-research/mandat-shared-solid-interop": "^1.0.0",
"@datev-research/mandat-shared-solid-requests": "^1.0.0",
"@datev-research/mandat-shared-theme": "^1.0.0",
"@datev-research/mandat-shared-components": "^1.0.1",
"@datev-research/mandat-shared-composables": "^1.0.1",
"@datev-research/mandat-shared-solid-interop": "^1.0.1",
"@datev-research/mandat-shared-solid-requests": "^1.0.1",
"@datev-research/mandat-shared-theme": "^1.0.1",
"@datev-research/mandat-shared-utils": "^1.0.1",
"github-fork-ribbon-css": "^0.2.3"
}
}
10 changes: 0 additions & 10 deletions apps/max/.dockerignore

This file was deleted.

File renamed without changes.
15 changes: 8 additions & 7 deletions apps/max/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apps/max",
"version": "0.1.0",
"version": "1.0.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -15,6 +15,7 @@
"@babel/preset-env": "^7.24.3",
"@babel/preset-typescript": "^7.26.0",
"@types/jest": "^29.0.0",
"@vue/cli-service": "~5.0.0",
"@vue/test-utils": "^2.4.5",
"@vue/vue3-jest": "^29.0.0",
"babel-jest": "^29.0.0",
Expand All @@ -23,12 +24,12 @@
"ts-jest": "^29.0.0"
},
"dependencies": {
"@datev-research/mandat-shared-components": "^1.0.0",
"@datev-research/mandat-shared-composables": "^1.0.0",
"@datev-research/mandat-shared-utils": "^1.0.0",
"@datev-research/mandat-shared-solid-interop": "^1.0.0",
"@datev-research/mandat-shared-solid-requests": "^1.0.0",
"@datev-research/mandat-shared-theme": "^1.0.0",
"@datev-research/mandat-shared-components": "^1.0.1",
"@datev-research/mandat-shared-composables": "^1.0.1",
"@datev-research/mandat-shared-solid-interop": "^1.0.1",
"@datev-research/mandat-shared-solid-requests": "^1.0.1",
"@datev-research/mandat-shared-theme": "^1.0.1",
"@datev-research/mandat-shared-utils": "^1.0.1",
"github-fork-ribbon-css": "^0.2.3"
}
}
10 changes: 0 additions & 10 deletions apps/tom/.dockerignore

This file was deleted.

Empty file added apps/tom/.npmrc
Empty file.
14 changes: 0 additions & 14 deletions apps/tom/Dockerfile

This file was deleted.

Loading
Loading