Merge branch 'CI-CD-updates' of https://github.com/NFDI4Chem/nmrkit into CI-CD-updates

Author: NishaSharma14

.github/workflows/dev-build.yml

@@ -32,7 +32,7 @@ jobs:
   build_and_push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-    #needs: test_and_lint
+    needs: test_and_lint
     steps:
       # Clone repository code to runner
       - name: Check out the repo

Dockerfile

@@ -6,12 +6,17 @@ ENV OPENBABEL_VERSION=v3.1
 ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}
 
-# Install runtime dependencies
+# Install runtime and build dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     software-properties-common \
     openjdk-17-jre \
-    curl && \
+    curl \
+    build-essential \
+    gcc \
+    g++ \
+    git \
+    wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     conda update -n base -c defaults conda
@@ -36,8 +41,7 @@ WORKDIR /code
 COPY ./requirements.txt /code/requirements.txt
 COPY ./alembic.ini /code/alembic.ini
 
-RUN pip3 install --upgrade setuptools pip && \
-    apt-get update && apt-get install -y git
+RUN pip3 install --upgrade setuptools pip
 
 RUN pip3 install --no-cache-dir -r /code/requirements.txt
 

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - shared-data:/shared
     ports:
-      - "80:80"
+      - "8080:80"
     healthcheck:
       test:
         [
@@ -62,7 +62,7 @@ services:
   redis:
     image: "redis:alpine"
     ports:
-      - "${FORWARD_REDIS_PORT:-6379}:6379"
+      - "${FORWARD_REDIS_PORT:-6380}:6379"
     volumes:
       - "redis:/data"
     networks:
@@ -74,7 +74,7 @@ services:
   pgsql:
     image: "informaticsmatters/rdkit-cartridge-debian"
     ports:
-      - "${FORWARD_DB_PORT:-5432}:5432"
+      - "${FORWARD_DB_PORT:-5433}:5432"
     env_file:
       - ./.env
     volumes:
@@ -97,8 +97,8 @@ services:
   minio:
     image: 'minio/minio:latest'
     ports:
-      - '${FORWARD_MINIO_PORT:-9001}:9001'
-      - '${FORWARD_MINIO_CONSOLE_PORT:-8900}:8900'
+      - '${FORWARD_MINIO_PORT:-9002}:9001'
+      - '${FORWARD_MINIO_CONSOLE_PORT:-8901}:8900'
     environment:
       MINIO_ROOT_USER: 'sail'
       MINIO_ROOT_PASSWORD: 'password'