Skip to content

Commit

Permalink
fix; update docker installation
Browse files Browse the repository at this point in the history
  • Loading branch information
NishaSharma14 committed Nov 6, 2023
1 parent 142f130 commit 90114bf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
FROM continuumio/miniconda3 AS nmrkit-ms

ENV PYTHON_VERSION=3.10
ENV RDKIT_VERSION=2023.03.1
ENV OPENBABEL_VERSION=v3.1

ARG RELEASE_VERSION
Expand All @@ -15,10 +14,13 @@ RUN apt-get update && \
apt-get install -y curl && \
conda update -n base -c defaults conda

RUN apt-get update && apt-get -y install docker.io

RUN conda install -c conda-forge python>=PYTHON_VERSION
RUN conda install -c conda-forge rdkit>=RDKIT_VERSION
RUN conda install -c conda-forge openbabel>=OPENBABEL_VERSION

RUN pip3 install rdkit

RUN python3 -m pip install -U pip

ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/nmr-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ COPY package.json ./
COPY package-lock.json ./
RUN npm install

RUN apk add docker

COPY . ./

#install the nmr-cli as a global package
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/nmr-respredict/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
FROM continuumio/miniconda3 AS nmr-respredict-ms

ENV PYTHON_VERSION=3.10
ENV RDKIT_VERSION=2023.09.1

# Install runtime dependencies
RUN apt-get update && \
Expand All @@ -11,7 +10,6 @@ RUN apt-get update && \
conda update -n base -c defaults conda

RUN conda install -c conda-forge python>=PYTHON_VERSION
# RUN conda install -c conda-forge rdkit>=RDKIT_VERSION
RUN python3 -m pip install -U pip

RUN pip3 install rdkit
Expand Down
12 changes: 5 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ version: "3.8"

services:
web:
build:
context: ./
dockerfile: Dockerfile
# build:
# context: ./
# dockerfile: Dockerfile
image: nfdi4chem/nmrkit:dev-latest
container_name: nmrkit-api
volumes:
- ./app:/code/app
- "/var/run/docker.sock:/var/run/docker.sock"
ports:
- "80:80"
healthcheck:
Expand All @@ -29,15 +31,11 @@ services:
entrypoint: /bin/sh
stdin_open: true
tty: true
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
nmr-respredict:
build: ./app/scripts/nmr-respredict
entrypoint: /bin/sh
stdin_open: true
tty: true
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
prometheus:
image: prom/prometheus
container_name: nmrkit_prometheus
Expand Down

0 comments on commit 90114bf

Please sign in to comment.