From f6c2ca4d62f666940b0c0d76e8540f6c3fd5e7f8 Mon Sep 17 00:00:00 2001 From: sangeetha jadamal Date: Sun, 16 Nov 2025 19:51:25 +0530 Subject: [PATCH 1/2] fix: Resolve docker-dev build failures for arm64 and macOS --- Dockerfile-dev | 6 ++++-- Makefile | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile-dev b/Dockerfile-dev index 17834a6f4..4cc96a29a 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,17 +1,19 @@ -FROM node:lts as build +FROM node:lts AS build WORKDIR /code COPY . /code +RUN apt-get update && apt-get install -y chromium RUN make install-deps-typescript && make install-typescript && make frontend -FROM python:3.11.0 as run +FROM python:3.11.0 AS run COPY --from=build /code /code WORKDIR /code RUN apt update &&\ apt install -y python3-numpy &&\ pip install virtualenv &&\ + python3 -m venv venv && \ make install-deps-python &&\ make install-python diff --git a/Makefile b/Makefile index e1da38cd1..c71842d4f 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ upstream-sync: . ./venv/bin/activate && python cre.py --upstream_sync dev-flask: - . ./venv/bin/activate && INSECURE_REQUESTS=1 FLASK_APP=`pwd`/cre.py FLASK_CONFIG=development flask run + . ./venv/bin/activate && INSECURE_REQUESTS=1 FLASK_APP=`pwd`/cre.py FLASK_CONFIG=development flask run --host=0.0.0.0 e2e: yarn build @@ -83,7 +83,7 @@ docker-prod: docker build -f Dockerfile -t opencre:$(shell git rev-parse HEAD) . docker-dev-run: - docker run -it -p 5000:5000 opencre-dev:$(shell git rev-parse HEAD) + docker run -it -p 5001:5000 opencre-dev:$(shell git rev-parse HEAD) docker-prod-run: docker run -it -p 5000:5000 opencre:$(shell git rev-parse HEAD) From a5436c062a6f02f6d3679096adde1ff0adb61492 Mon Sep 17 00:00:00 2001 From: sangeetha jadamal Date: Mon, 8 Dec 2025 14:00:07 +0530 Subject: [PATCH 2/2] fix: Update ENTRYPOINT in Dockerfile and add dev-flask target in Makefile for improved development workflow --- Dockerfile-dev | 2 +- Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile-dev b/Dockerfile-dev index 4cc96a29a..736cd192a 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -17,4 +17,4 @@ RUN apt update &&\ make install-deps-python &&\ make install-python -ENTRYPOINT make dev-flask +ENTRYPOINT make dev-flask-docker diff --git a/Makefile b/Makefile index c71842d4f..5d53f1db7 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,9 @@ upstream-sync: . ./venv/bin/activate && python cre.py --upstream_sync dev-flask: + . ./venv/bin/activate && INSECURE_REQUESTS=1 FLASK_APP=`pwd`/cre.py FLASK_CONFIG=development flask run + +dev-flask-docker: . ./venv/bin/activate && INSECURE_REQUESTS=1 FLASK_APP=`pwd`/cre.py FLASK_CONFIG=development flask run --host=0.0.0.0 e2e: @@ -83,7 +86,7 @@ docker-prod: docker build -f Dockerfile -t opencre:$(shell git rev-parse HEAD) . docker-dev-run: - docker run -it -p 5001:5000 opencre-dev:$(shell git rev-parse HEAD) + docker run -it -p 127.0.0.1:5000:5000 opencre-dev:$(shell git rev-parse HEAD) docker-prod-run: docker run -it -p 5000:5000 opencre:$(shell git rev-parse HEAD)