diff --git a/dockerfiles/Dockerfile.openshift b/dockerfiles/Dockerfile.openshift deleted file mode 100644 index 0a1527c..0000000 --- a/dockerfiles/Dockerfile.openshift +++ /dev/null @@ -1,48 +0,0 @@ -# node-build stage - -FROM docker-registry.default.svc:5000/openshift/node:16-slim AS node-build -WORKDIR /build/ - -COPY frontend . -RUN npm install - -RUN npm run build:frontend - -# main stage - -FROM docker-registry.default.svc:5000/openshift/python:3.8-slim AS main - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - build-essential default-libmysqlclient-dev netcat vim-tiny jq python3-dev git supervisor curl && \ - apt-get upgrade -y && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* - -COPY requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt - -WORKDIR /code - -# Copy only what is needed into /code/ -COPY backend ./backend -COPY templates ./templates -COPY manage.py start_backend.sh ./ - -COPY --from=node-build /build/bundles ./frontend/bundles -COPY --from=node-build /build/webpack-stats.json ./frontend/ - -# Collect the static files in the backend -RUN python manage.py collectstatic --verbosity 0 - -# Sets the local timezone of the docker image -ARG TZ -ENV TZ ${TZ:-America/Detroit} -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -# EXPOSE port 5000 to allow communication to/from server -EXPOSE 5000 - -CMD ["/code/start_backend.sh"] - -# Done! diff --git a/dockerfiles/Dockerfile.prod b/dockerfiles/Dockerfile.prod index 2935063..7da2fa5 100644 --- a/dockerfiles/Dockerfile.prod +++ b/dockerfiles/Dockerfile.prod @@ -14,7 +14,7 @@ FROM python:3.10-slim-bookworm AS main RUN apt-get update && \ apt-get install -y --no-install-recommends \ - build-essential default-libmysqlclient-dev netcat vim-tiny jq python3-dev git supervisor curl && \ + build-essential default-libmysqlclient-dev netcat-openbsd vim-tiny jq python3-dev git supervisor curl && \ apt-get upgrade -y && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*