Skip to content

Commit

Permalink
[FIX] Implement workaround to be able to compile unupdated angular de…
Browse files Browse the repository at this point in the history
…pendency
  • Loading branch information
nck974 committed Dec 14, 2023
1 parent f12b7a3 commit ceb1f1e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 11 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ https://start.spring.io/#!type=maven-project&language=java&platformVersion=3.0.4

#### Create backend docker container

1. First build the image with `cd diogenes & ./mvnw install`.
1. Build the container with `docker build -f docker/Dockerfile -t nck974/diogenes:0.0.3 .`
1. First build the image with `cd diogenes && ./mvnw install`.
1. Build the container with `cd .. && docker build -f docker/Dockerfile -t nck974/diogenes:0.0.5 .`
1. Generate a token in `https://hub.docker.com` and login with `docker login -u <user>`. Paste the generated token as password.
1. Push the generated container with `docker push nck974/diogenes:0.0.3`.
1. Push the generated container with `docker push nck974/diogenes:0.0.5`.
1. Create the `latest` tag and push it:

```bash
docker tag nck974/diogenes:0.0.3 nck974/diogenes:latest
docker tag nck974/diogenes:0.0.5 nck974/diogenes:latest
docker push nck974/diogenes:latest
```

Expand All @@ -113,13 +113,13 @@ To run the app in development mode just access the folder `diogenes-ng` and star

#### Create frontend docker container

1. Build the container with `docker build -f docker/Dockerfile.angular -t nck974/diogenes-ng:0.0.4 .`
1. Build the container with `docker build -f docker/Dockerfile.angular -t nck974/diogenes-ng:0.0.6 .`
1. Generate a token in `https://hub.docker.com` and login with `docker login -u <user>`. Paste the generated token as password.
1. Push the generated container with `docker push nck974/diogenes-ng:0.0.4`.
1. Push the generated container with `docker push nck974/diogenes-ng:0.0.6`.
1. Create the `latest` tag and push it:

```bash
docker tag nck974/diogenes-ng:0.0.4 nck974/diogenes-ng:latest
docker tag nck974/diogenes-ng:0.0.6 nck974/diogenes-ng:latest
docker push nck974/diogenes-ng:latest
```

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.angular
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /app
RUN npm install -g @angular/cli

COPY ng-diogenes/package.json ng-diogenes/package-lock.json ./
RUN npm install
RUN npm install --fetch-timeout=600000
COPY ng-diogenes/. .

RUN ng build --configuration production --output-path=/dist
Expand Down
4 changes: 2 additions & 2 deletions ng-diogenes/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion ng-diogenes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,15 @@
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.2.2"
},
"overrides": {
"@angular-material-components/color-picker": {
"@angular/platform-browser": ">=17.0.0",
"@angular/common": ">=17.0.0",
"@angular/core": ">=17.0.0",
"@angular/forms": ">=17.0.0",
"@angular/material": ">=17.0.0",
"@angular/cdk": ">=17.0.0"
}
}
}
}

0 comments on commit ceb1f1e

Please sign in to comment.