Merge pull request #276 from NFDI4Chem/development

Development

Author: NishaSharma14

.github/workflows/dev-build.yml

@@ -16,7 +16,7 @@ on:
     branches: [development]
 
 env:
-  DEPLOYMENT_NAME: nmrxiv-nmrium
+  DEPLOYMENT_NAME: nmrxiv-nmrium-dev
   DOCKER_HUB_USERNAME : ${{ secrets.DOCKER_HUB_USERNAME  }}
   DOCKER_HUB_PASSWORD : ${{ secrets.DOCKER_HUB_PASSWORD  }}
   REPOSITORY_NAME: nmrium-react-wrapper
@@ -53,7 +53,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./Dockerfile.prod
+        file: ./Dockerfile.dev
         push: true
         build-args: |
           RELEASE_VERSION=dev-latest

README.md

@@ -15,14 +15,18 @@ To further enable integration in other applications developed with modern framew
 
 #### Production:
 
-[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v0.8.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.8.0))
+[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v1.0.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v1.0.0))
 
 #### Development:
 
 [https://nmriumdev.nmrxiv.org](https://nmriumdev.nmrxiv.org) (latest)
 
 #### For older/specific versions
 
+[https://nmrium.nmrxiv.org/v1.0.0](https://nmrium.nmrxiv.org/v1.0.0) -> [v1.0.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v1.0.0)
+
+[https://nmrium.nmrxiv.org/v0.9.0](https://nmrium.nmrxiv.org/v0.9.0) -> [v0.9.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.9.0)
+
 [https://nmrium.nmrxiv.org/v0.8.0](https://nmrium.nmrxiv.org/v0.8.0) -> [v0.8.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.8.0)
 
 [https://nmrium.nmrxiv.org/v0.7.0](https://nmrium.nmrxiv.org/v0.7.0) -> [v0.7.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.7.0)
@@ -31,13 +35,6 @@ To further enable integration in other applications developed with modern framew
 
 [https://nmrium.nmrxiv.org/v0.5.0](https://nmrium.nmrxiv.org/v0.5.0) -> [v0.5.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.5.0)
 
-[https://nmrium.nmrxiv.org/v0.4.0](https://nmrium.nmrxiv.org/v0.4.0) -> [v0.4.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.4.0)
-
-[https://nmrium.nmrxiv.org/v0.3.0](https://nmrium.nmrxiv.org/v0.3.0) -> [v0.3.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.3.0)
-
-[https://nmrium.nmrxiv.org/v0.2.0](https://nmrium.nmrxiv.org/v0.2.0) -> [v0.2.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.2.0)
-
-[https://nmrium.nmrxiv.org/v0.1.0](https://nmrium.nmrxiv.org/v0.1.0) -> [v0.1.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.1.0)
 
 ### Docker Hub
 Containerized using Docker and is distributed publicly via the [Docker Hub](https://hub.docker.com/r/nfdi4chem/nmrium-react-wrapper).
@@ -98,7 +95,7 @@ Raise an issue on GitHub - https://github.com/NFDI4Chem/nmrium-react-wrapper/iss
 
 | NMRium React Wrapper Version | NMRium Version | NMRium Data Schema Version | Migration Script |
 |:----           |:---                          | :----                        | :----            |
-|        [Latest-stable](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.9.0)           |     [v0.56.0](https://github.com/cheminfo/nmrium/releases/tag/v0.56.0)    |      [v4](/public/data/Data%20Schema%20Versions/V4/)                  |   [Migration script](https://github.com/cheminfo/nmr-load-save/blob/master/src/migration/migrateToVersion3.ts) |
+|        [Latest-stable](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v1.0.0)           |     [v0.65.0](https://github.com/cheminfo/nmrium/releases/tag/v0.65.0)    |      [v4](/public/data/Data%20Schema%20Versions/V4/)                  |   [Migration script](https://github.com/cheminfo/nmr-load-save/blob/master/src/migration/migrateToVersion3.ts) |
 
 
 ## License

docker-compose.local.yml

@@ -6,6 +6,8 @@ services:
       context: .
       dockerfile: Dockerfile.dev
     restart: always
+    ports:
+      - "81:80"
     networks:
       - nmrium-network
     environment:
@@ -26,21 +28,6 @@ services:
     networks:
       - nmrium-network
 
-  # Nginx reverse proxy
-  nginx-proxy:
-    container_name: nginx-proxy
-    image: nginx:stable-alpine
-    ports:
-      - "8080:80"  # Dev environment on port 8080
-      - "8081:81"  # Prod environment on port 8081
-    volumes:
-      - ./nginx/proxy.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      - nmrium-dev
-      - nmrium-prod
-    networks:
-      - nmrium-network
-
 networks:
   nmrium-network:
     driver: bridge 

docker-compose.yml

@@ -1,43 +1,44 @@
-version: '3.7'
+version: "3.8"
 
 services:
   # Development environment
   nmrium-dev:
     container_name: nmrium-dev
     image: nfdi4chem/nmrium-react-wrapper:dev-latest
-    restart: always
+    restart: unless-stopped
+    ports:
+      - "81:80"
     networks:
       - nmrium-network
     environment:
       - NODE_ENV=development
       - CHOKIDAR_USEPOLLING=true
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
 
   # Production environment
   nmrium-prod:
     container_name: nmrium-prod
     image: nfdi4chem/nmrium-react-wrapper:latest
-    restart: always
+    restart: unless-stopped
+    ports:
+      - "80:80"
     networks:
       - nmrium-network
     environment:
       - NODE_ENV=production
       - RELEASE_VERSION=latest
-
-  # Nginx reverse proxy
-  nginx-proxy:
-    container_name: nginx-proxy
-    image: nginx:stable-alpine
-    ports:
-      - "8080:80"  # Dev environment on port 8080
-      - "8081:81"  # Prod environment on port 8081
-    volumes:
-      - ./nginx/proxy.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      - nmrium-dev
-      - nmrium-prod
-    networks:
-      - nmrium-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
 
 networks:
   nmrium-network:
-    driver: bridge 
+    driver: bridge