Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: use fedora base image #4348

Merged
merged 1 commit into from
Aug 1, 2024
Merged

docker: use fedora base image #4348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions CentOS-Base.repo
View file
Open in desktop

This file was deleted.

60 changes: 28 additions & 32 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,10 @@
# Modified and simplified version of https://github.com/inspirehep/inspire-docker
# to build an imagine to run in https://github.com/inspirehep/inspirehep

FROM centos:7
# https://www.redhat.com/en/blog/centos-linux-has-reached-its-end-life-eol
# https://serverfault.com/a/1161904
COPY CentOS-Base.repo ./etc/yum.repos.d/CentOS-Base.repo
RUN yum clean all && yum makecache

RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
yum update -y --nogpgcheck && \
yum install -y --nogpgcheck \
ImageMagick \
FROM fedora:40

RUN dnf update -y && \
dnf install -y ImageMagick \
transfig \
file \
firefox \
Expand All @@ -45,19 +39,18 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
libxml2-devel \
libxslt-devel \
mailcap \
make \
xrootd-client-devel \
openssl-devel \
poppler-utils \
postgresql \
postgresql-libs \
postgresql-devel \
python-pip \
python-devel \
python2-xrootd \
python2.7 \
wget \
Xvfb \
&& \
yum clean all
xrootd \
&& dnf clean all


ENV NODE_VERSION 6.17.1
RUN mkdir /usr/local/nvm
Expand All @@ -80,30 +73,33 @@ RUN npm install -g \
requirejs \
uglify-js

ENV PATH="/root/.poetry/bin:${PATH}" \
POETRY_VIRTUALENVS_CREATE=false \
POETRY_VERSION=1.1.14

WORKDIR /code

RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/4ec09d4e6b8ca007e67bb873c96277b54986fbdb/get-poetry.py \
| sed -E 's/(self\._get\(self\.METADATA_URL\).decode)\(\)/\1("utf-8")/' \
| python && \
poetry --version && \
pip install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --ignore-installed --no-cache-dir --upgrade pip==20.3.4 && \
pip install --no-cache-dir --upgrade setuptools && \
pip install --no-cache-dir --upgrade wheel && \
pip install --no-cache-dir typing==3.7.4.1
RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python2 get-pip.py && \
rm get-pip.py

COPY . .

RUN poetry export --without-hashes -E all -E xrootd -f requirements.txt > requirements.poetry.txt && \
pip install --ignore-installed --requirement requirements.poetry.txt && \
pip install -e .
RUN python2.7 -m pip install poetry==1.1.15 && \
python2.7 -m pip install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --ignore-installed --no-cache-dir --upgrade pip==20.3.4 && \
python2.7 -m pip install --no-cache-dir --upgrade setuptools && \
python2.7 -m pip install --no-cache-dir --upgrade wheel



RUN poetry config virtualenvs.create false && \
poetry export --without-hashes -E all -E xrootd -f requirements.txt > requirements.poetry.txt

RUN python2.7 -m pip install --ignore-installed --requirement requirements.poetry.txt && \
python2.7 -m pip install -e . && \
python2.7 -m pip install git+https://github.com/inspirehep/xrootd-python.git && \
python2.7 -m pip install --requirement requirements_docker.txt


WORKDIR /usr/var/inspirehep-instance/static

RUN inspirehep npm && \
RUN inspirehep npm && \
npm install && \
inspirehep collect -v && \
inspirehep assets build
Expand Down
60 changes: 26 additions & 34 deletions Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,10 @@
# Modified and simplified version of https://github.com/inspirehep/inspire-docker
# to build an imagine to run in https://github.com/inspirehep/inspirehep

FROM centos:7
# https://www.redhat.com/en/blog/centos-linux-has-reached-its-end-life-eol
# https://serverfault.com/a/1161904
COPY CentOS-Base.repo ./etc/yum.repos.d/CentOS-Base.repo
RUN yum clean all && yum makecache

RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
yum update -y --nogpgcheck && \
yum install -y --nogpgcheck \
yum update -y && \
yum install -y \
ImageMagick \
FROM fedora:40

RUN dnf update -y && \
dnf install -y ImageMagick \
transfig \
file \
firefox \
Expand All @@ -47,19 +39,18 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
libxml2-devel \
libxslt-devel \
mailcap \
make \
xrootd-client-devel \
openssl-devel \
poppler-utils \
postgresql \
postgresql-libs \
postgresql-devel \
python-pip \
python-devel \
python2-xrootd \
python2.7 \
wget \
Xvfb \
&& \
yum clean all
xrootd \
&& dnf clean all


ENV NODE_VERSION 6.17.1
RUN mkdir /usr/local/nvm
Expand All @@ -82,30 +73,31 @@ RUN npm install -g \
requirejs \
uglify-js

ENV PATH="/root/.poetry/bin:${PATH}" \
POETRY_VIRTUALENVS_CREATE=false \
POETRY_VERSION=1.1.14

WORKDIR /code

RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/4ec09d4e6b8ca007e67bb873c96277b54986fbdb/get-poetry.py \
| sed -E 's/(self\._get\(self\.METADATA_URL\).decode)\(\)/\1("utf-8")/' \
| python && \
poetry --version && \
pip install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --ignore-installed --no-cache-dir --upgrade pip==20.3.4 && \
pip install --no-cache-dir --upgrade setuptools && \
pip install --no-cache-dir --upgrade wheel && \
pip install --no-cache-dir typing==3.7.4.1
RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python2 get-pip.py && \
rm get-pip.py

RUN python2.7 -m pip install poetry==1.1.15 && \
python2.7 -m pip install --no-cache-dir --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --ignore-installed --no-cache-dir --upgrade pip==20.3.4 && \
python2.7 -m pip install --no-cache-dir --upgrade setuptools && \
python2.7 -m pip install --no-cache-dir --upgrade wheel

COPY . .

RUN poetry export --without-hashes -E all -f requirements.txt > requirements.poetry.txt && \
pip install --ignore-installed --src /opt/python-git-modules/ --requirement requirements.poetry.txt && \
pip install -e .
RUN poetry config virtualenvs.create false && \
poetry export --without-hashes -E all -f requirements.txt > requirements.poetry.txt

RUN python2.7 -m pip install --ignore-installed --src /opt/python-git-modules/ --requirement requirements.poetry.txt && \
python2.7 -m pip install -e . && \
python2.7 -m pip install git+https://github.com/inspirehep/xrootd-python.git && \
python2.7 -m pip install --requirement requirements_docker.txt


WORKDIR /usr/var/inspirehep-instance/static

RUN inspirehep npm && \
RUN inspirehep npm && \
npm install && \
inspirehep collect -v && \
inspirehep assets build
Expand Down
4 changes: 4 additions & 0 deletions requirements_docker.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
typing==3.7.4.1
pathlib2==2.3.5
six==1.14.0
urllib3==1.24.3
Loading