diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 834cbdf..14a3763 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -1,4 +1,4 @@ FROM mcr.microsoft.com/dotnet/core/aspnet:latest -COPY musiccatalogue.api-1.30.0.0 /opt/musiccatalogue.api-1.30.0.0 -WORKDIR /opt/musiccatalogue.api-1.30.0.0/bin +COPY musiccatalogue.api-1.31.0.0 /opt/musiccatalogue.api +WORKDIR /opt/musiccatalogue.api/bin ENTRYPOINT [ "./MusicCatalogue.Api" ] diff --git a/docker/api/README.md b/docker/api/README.md index 58df11f..8d10e8b 100644 --- a/docker/api/README.md +++ b/docker/api/README.md @@ -24,23 +24,21 @@ In order to run this image you'll need docker installed. The following "docker run" parameters are recommended when running the musiccatalogueapisqlite image: -| Parameter | Value | Purpose | -| --------- | ------------------------------------------ | --------------------------------------------------------------------- | -| -d | - | Run as a background process | -| -v | /local:/var/opt/musiccatalogue.api-1.0.0.0 | Mount the host folder containing the SQLite database and API key file | -| -p | 7295:80 | Expose the container's port 80 as port 7295 on the host | -| --rm | - | Remove the container automatically when it stops | +| Parameter | Value | Purpose | +| --------- | ---------------------------------- | --------------------------------------------------------------------- | +| -d | - | Run as a background process | +| -v | /local:/var/opt/musiccatalogue.api | Mount the host folder containing the SQLite database and API key file | +| -p | 7295:80 | Expose the container's port 80 as port 7295 on the host | +| --rm | - | Remove the container automatically when it stops | For example: ```shell -docker run -d -v /local:/var/opt/musiccatalogue.api-1.0.0.0 -p 7295:80 --rm davewalker5/musiccatalogueapisqlite:latest +docker run -d -v /local:/var/opt/musiccatalogue.api -p 7295:80 --rm davewalker5/musiccatalogueapisqlite:latest ``` The "/local" path given to the -v argument is described, below, and should be replaced with a value appropriate for the host running the container. -The version (1.0.0.0) should also be replaced with the version number for the version of the image being run. - Similarly, the port number "7295" can be replaced with any available port on the host. #### Volumes @@ -53,10 +51,10 @@ The key file should be a plain text file called "radpidapi.key" and should conta #### Running the Image -To run the image, enter the following command, substituting "/local" for the host folder containing the SQLite database and the version (1.0.0.0) with the version number for the version of the image being run, as described: +To run the image, enter the following command, substituting "/local" for the host folder containing the SQLite database, as described: ```shell -docker run -d -v /local:/var/opt/musiccatalogue.api-1.0.0.0 -p 7295:80 --rm davewalker5/musiccatalogueapisqlite:latest +docker run -d -v /local:/var/opt/musiccatalogue.api -p 7295:80 --rm davewalker5/musiccatalogueapisqlite:latest ``` Once the container is running, browse to the following URL on the host: @@ -65,16 +63,6 @@ http://localhost:7295 You should see the Swagger API documentation for the API. -## Built With - -The musiccatalogueapisqlite image was been built with the following: - -| Aspect | Version | -| -------------- | --------------- | -| .NET | 7.0.401 | -| Target Runtime | linux-x64 | -| Docker Desktop | 4.23.0 (120376) | - ## Find Us - [MusicCatalogue on GitHub](https://github.com/davewalker5/MusicCatalogue) diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index 7ba218c..c0cdaac 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -1,6 +1,6 @@ FROM node:20-alpine -COPY musiccatalogue.ui-1.30.0.0 /opt/musiccatalogue.ui-1.30.0.0 -WORKDIR /opt/musiccatalogue.ui-1.30.0.0 +COPY musiccatalogue.ui-1.31.0.0 /opt/musiccatalogue.ui +WORKDIR /opt/musiccatalogue.ui RUN npm install RUN npm run build ENTRYPOINT [ "npm", "start" ] diff --git a/docker/ui/README.md b/docker/ui/README.md index c3c81f1..ce9e652 100644 --- a/docker/ui/README.md +++ b/docker/ui/README.md @@ -24,23 +24,21 @@ In order to run this image you'll need docker installed. The following "docker run" parameters are recommended when running the musiccatalogueui image: -| Parameter | Value | Purpose | -| --------- | --------------------------------------------------------------------------- | --------------------------------------------------------- | -| -d | - | Run as a background process | -| -v | /local/config/ui-config.json:/var/opt/musiccatalogue.ui-1.0.0.0/config.json | Mount the file containing the UI config | -| -p | 8086:3000 | Expose the container's port 3000 as port 8086 on the host | -| --rm | - | Remove the container automatically when it stops | +| Parameter | Value | Purpose | +| --------- | ------------------------------------------------------------------- | --------------------------------------------------------- | +| -d | - | Run as a background process | +| -v | /local/config/ui-config.json:/var/opt/musiccatalogue.ui/config.json | Mount the file containing the UI config | +| -p | 8086:3000 | Expose the container's port 3000 as port 8086 on the host | +| --rm | - | Remove the container automatically when it stops | For example: ```shell -docker run -d -v /local/config/ui-config.json:/var/opt/musiccatalogue.ui-1.0.0.0/config.json -p 8086:3000 --rm davewalker5/musiccatalogueui:latest +docker run -d -v /local/config/ui-config.json:/var/opt/musiccatalogue.ui/config.json -p 8086:3000 --rm davewalker5/musiccatalogueui:latest ``` The local path given to the -v argument is described, below, and should be replaced with a value appropriate for the host running the container. -The version (1.0.0.0) should also be replaced with the version number for the version of the image being run. - Similarly, the port number "8086" can be replaced with any available port on the host. #### Mounted Configuration File @@ -67,8 +65,6 @@ As the UI needs to be run in concert with the web service, it's recommended to r it using Docker Compose. The following is an example compose file: ```yml -version: "3.7" - services: music-ui: container_name: musiccatalogueui @@ -77,7 +73,7 @@ services: ports: - "8086:3000" volumes: - - /local/config/ui-config.json:/opt/musiccatalogue.ui-1.4.0.0/config.json + - /local/config/ui-config.json:/opt/musiccatalogue.ui/config.json music-api: container_name: musiccatalogueservice @@ -86,7 +82,7 @@ services: ports: - "8098:80" volumes: - - /local/data:/var/opt/musiccatalogue.api-1.4.0.0/ + - /local/data:/var/opt/musiccatalogue.api/ ``` The local path to the config file and the local data path and port for the service should be set per the @@ -94,16 +90,6 @@ instructions, above, and the instructions for the [musiccatalogueapisqlite](http The port for the UI, 8086, should be set to an available local port. -## Built With - -The musiccatalogueui image was been built with the following: - -| Aspect | Version | -| -------------- | --------------- | -| Node | 20.6.0 | -| Target Runtime | linux-x64 | -| Docker Desktop | 4.23.0 (120376) | - ## Find Us - [MusicCatalogue on GitHub](https://github.com/davewalker5/MusicCatalogue) diff --git a/src/MusicCatalogue.Api/MusicCatalogue.Api.csproj b/src/MusicCatalogue.Api/MusicCatalogue.Api.csproj index 057532d..e25012e 100644 --- a/src/MusicCatalogue.Api/MusicCatalogue.Api.csproj +++ b/src/MusicCatalogue.Api/MusicCatalogue.Api.csproj @@ -2,9 +2,9 @@ net8.0 - 1.30.0.0 - 1.30.0.0 - 1.30.0 + 1.31.0.0 + 1.31.0.0 + 1.31.0 enable enable diff --git a/src/music-catalogue-ui/components/reports/genreAlbumRow.js b/src/music-catalogue-ui/components/reports/genreAlbumRow.js index a89cf92..83f3abf 100644 --- a/src/music-catalogue-ui/components/reports/genreAlbumRow.js +++ b/src/music-catalogue-ui/components/reports/genreAlbumRow.js @@ -9,7 +9,7 @@ import DateFormatter from "../common/dateFormatter"; */ const GenreAlbumRow = ({ record }) => { const purchaseDate = new Date(record.purchased); - console.log(purchaseDate.getFullYear()); + return ( {record.artist}