Skip to content

Commit 58b1ea2

Browse files
committed
fix: ASGI app loading issue fix
1 parent 433542a commit 58b1ea2

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.github/workflows/dev-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ env:
2323

2424
jobs:
2525
test_and_lint:
26-
uses: NFDI4Chem/nmrkit/.github/workflows/test.yml@main
26+
uses: ./.github/workflows/test.yml
2727

2828
push_to_registry:
2929
name: Push Docker image to Docker Hub
3030
runs-on: ubuntu-latest
31-
#needs: test_and_lint
31+
needs: test_and_lint
3232
steps:
3333
- name: Check out the repo
3434
uses: actions/checkout@v4

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ ENV OPENBABEL_VERSION=v3.1
66
ARG RELEASE_VERSION
77
ENV RELEASE_VERSION=${RELEASE_VERSION}
88

9-
# Install runtime dependencies
9+
# Install runtime and build dependencies
1010
RUN apt-get update && \
1111
apt-get install -y --no-install-recommends \
1212
software-properties-common \
1313
openjdk-17-jre \
14-
curl && \
14+
curl \
15+
build-essential \
16+
gcc \
17+
g++ \
18+
git \
19+
wget && \
1520
apt-get clean && \
1621
rm -rf /var/lib/apt/lists/* && \
1722
conda update -n base -c defaults conda
@@ -36,8 +41,7 @@ WORKDIR /code
3641
COPY ./requirements.txt /code/requirements.txt
3742
COPY ./alembic.ini /code/alembic.ini
3843

39-
RUN pip3 install --upgrade setuptools pip && \
40-
apt-get update && apt-get install -y git
44+
RUN pip3 install --upgrade setuptools pip
4145

4246
RUN pip3 install --no-cache-dir -r /code/requirements.txt
4347

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- "/var/run/docker.sock:/var/run/docker.sock"
1313
- shared-data:/shared
1414
ports:
15-
- "80:80"
15+
- "8080:80"
1616
healthcheck:
1717
test:
1818
[
@@ -62,7 +62,7 @@ services:
6262
redis:
6363
image: "redis:alpine"
6464
ports:
65-
- "${FORWARD_REDIS_PORT:-6379}:6379"
65+
- "${FORWARD_REDIS_PORT:-6380}:6379"
6666
volumes:
6767
- "redis:/data"
6868
networks:
@@ -74,7 +74,7 @@ services:
7474
pgsql:
7575
image: "informaticsmatters/rdkit-cartridge-debian"
7676
ports:
77-
- "${FORWARD_DB_PORT:-5432}:5432"
77+
- "${FORWARD_DB_PORT:-5433}:5432"
7878
env_file:
7979
- ./.env
8080
volumes:
@@ -97,8 +97,8 @@ services:
9797
minio:
9898
image: 'minio/minio:latest'
9999
ports:
100-
- '${FORWARD_MINIO_PORT:-9001}:9001'
101-
- '${FORWARD_MINIO_CONSOLE_PORT:-8900}:8900'
100+
- '${FORWARD_MINIO_PORT:-9002}:9001'
101+
- '${FORWARD_MINIO_CONSOLE_PORT:-8901}:8900'
102102
environment:
103103
MINIO_ROOT_USER: 'sail'
104104
MINIO_ROOT_PASSWORD: 'password'

0 commit comments

Comments
 (0)