Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions deploy/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM golang:1.20 AS builder
FROM golang:1.23 AS builder
WORKDIR /docker-compose-generate
COPY ./util/docker-compose-generate /docker-compose-generate
RUN make build

FROM python:3.12
FROM python:3.13-bookworm

COPY --from=builder /docker-compose-generate/dcg /dcg
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
git \
Expand All @@ -16,19 +15,26 @@ RUN apt-get update \
zlib1g-dev \
libssl-dev \
supervisor \
\
\
libxml2 \
libxml2-dev \
libxslt1-dev \
libxslt1.1 \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /tmp
RUN curl -O http://nginx.org/download/nginx-1.24.0.tar.gz \
&& tar -zxvf nginx-1.24.0.tar.gz \
&& cd nginx-1.24.0 \
ARG NGINX_VERSION=1.29.1
RUN curl -O http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
&& tar -zxvf nginx-${NGINX_VERSION}.tar.gz \
&& cd nginx-${NGINX_VERSION} \
&& ./configure \
--with-http_ssl_module \
--with-http_v2_module \
--with-http_gzip_static_module \
&& make \
&& make install \
&& rm -rf /tmp/nginx-1.24.0*
&& rm -rf /tmp/nginx-${NGINX_VERSION}*

# Add Nginx binary location to PATH
ENV PATH="/usr/local/nginx/sbin:$PATH"
Expand All @@ -49,6 +55,8 @@ ADD ./main.py /home/docker/code/
ADD Manifest /home/docker/code/
ADD LICENSE /home/docker/code/

COPY --from=builder /docker-compose-generate/dcg /dcg

# Generate Docker compose template
RUN /dcg --raw > /home/docker/code/install_scripts/templates/swarm/docker-compose-generate-safe.sh

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
boto3==1.35.78
Flask==3.1.0
Flask==3.1.1
mysql-connector==2.1.7
pytest==8.3.4
pytest-mock==3.14.0
Expand Down