diff --git a/deploy/Dockerfile.prod b/deploy/Dockerfile.prod index cde99dac..7f35fe69 100644 --- a/deploy/Dockerfile.prod +++ b/deploy/Dockerfile.prod @@ -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 \ @@ -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" @@ -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 diff --git a/requirements.txt b/requirements.txt index 11613ae2..04036437 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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