From 4575e83a3b72e2d2c3a3392e0d3a4019db543dac Mon Sep 17 00:00:00 2001 From: Nicola Tarocco Date: Mon, 28 Nov 2022 15:55:21 +0100 Subject: [PATCH] global: upgrade to Almalinux --- Dockerfile | 8 +++----- docker/nginx/conf.d/default.conf | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8ea506..e6685cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ # Dockerfile that builds a fully functional image of your app. # # This image installs all Python dependencies for your application. It's based -# on CentOS 7 with Python 3 (https://github.com/inveniosoftware/docker-invenio) +# on Almalinux (https://github.com/inveniosoftware/docker-invenio) # and includes Pip, Pipenv, Node.js, NPM and some few standard libraries # Invenio usually needs. # # Note: It is important to keep the commands in this file in sync with your # bootstrap script located in ./scripts/bootstrap. -FROM inveniosoftware/centos7-python:3.9 +FROM registry.cern.ch/inveniosoftware/almalinux:1 COPY site ./site COPY Pipfile Pipfile.lock ./ @@ -24,8 +24,6 @@ COPY ./ . RUN cp -r ./static/. ${INVENIO_INSTANCE_PATH}/static/ && \ cp -r ./assets/. ${INVENIO_INSTANCE_PATH}/assets/ && \ invenio collect --verbose && \ - invenio webpack create && \ - invenio webpack install --unsafe && \ - invenio webpack build + invenio webpack buildall ENTRYPOINT [ "bash", "-c"] diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 9d277b1..9d8825f 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -24,8 +24,8 @@ server { # HTTPS server server { - listen 443 ssl; # IPv4 - listen [::]:443 ssl; # IPv6 + listen 443 ssl http2; # IPv4 + listen [::]:443 ssl http2; # IPv6 server_name _; charset utf-8; keepalive_timeout 5;