From fdacafcb72d3b32d9c52d9c8a3f685db55a94901 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 25 Jan 2024 09:14:34 +0100 Subject: [PATCH 1/5] Fixed Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9958a360b..de90f4002 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ COPY . . # install panda-common first to prevent panda-client from installing redundant files RUN /opt/panda/bin/pip install --no-cache-dir panda-common -RUN /opt/panda/bin/python setup.py sdist; /opt/panda/bin/pip install --no-cache-dir `ls dist/p*.tar.gz`[postgres] +RUN /opt/panda/bin/pip install --no-cache-dir .[postgres] RUN /opt/panda/bin/pip install --no-cache-dir rucio-clients RUN /opt/panda/bin/pip install --no-cache-dir "git+https://github.com/PanDAWMS/panda-cacheschedconfig.git" RUN ln -s /opt/panda/lib/python*/site-packages/mod_wsgi/server/mod_wsgi*.so /etc/httpd/modules/mod_wsgi.so From 743785af1706e571b381434fb833b7a4c51ee863 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 25 Jan 2024 09:21:29 +0100 Subject: [PATCH 2/5] Fixed Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de90f4002..358727694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN yum clean all && rm -rf /var/cache/yum RUN python$(echo ${PYTHON_VERSION} | sed -E 's/\.[0-9]+$//') -m venv /opt/panda RUN /opt/panda/bin/pip install --no-cache-dir -U pip RUN /opt/panda/bin/pip install --no-cache-dir -U setuptools -RUN /opt/panda/bin/pip install -U gnureadline +RUN /opt/panda/bin/pip install --no-cache-dir -U gnureadline RUN adduser atlpan RUN groupadd zp RUN usermod -a -G zp atlpan From 03f65898a01d431a64681a36bc7e73630747e2c8 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 25 Jan 2024 09:53:23 +0100 Subject: [PATCH 3/5] Fixed Dockerfile --- Dockerfile | 4 ++-- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 358727694..6d70a0f86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,11 @@ RUN mkdir /tmp/python && cd /tmp/python && \ wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \ tar -xzf Python-*.tgz && rm -f Python-*.tgz && \ cd Python-* && \ - ./configure --enable-shared --enable-optimizations --with-lto && \ + ./configure --enable-shared && \ make altinstall && \ echo /usr/local/lib > /etc/ld.so.conf.d/local.conf && ldconfig && \ cd / && rm -rf /tmp/pyton - + # ./configure --enable-shared --enable-optimizations --with-lto && \ # install postgres RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm diff --git a/pyproject.toml b/pyproject.toml index cb662edb3..33aaa543d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,6 +64,7 @@ packages = ["pandaserver"] "templates/bin" = "usr/bin" "templates/init.d" = "etc/rc.d/init.d" "templates/systemd" = "etc/systemd/system" +"templates/sysconfig" = "etc/sysconfig" [tool.hatch.build.targets.wheel.hooks.custom] path = "package/hatch_build.py" From 50df061d41273fbc14136c7e79a256f735eb3dba Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 25 Jan 2024 10:04:54 +0100 Subject: [PATCH 4/5] Fixed Dockerfile --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 33aaa543d..873b1c742 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,7 @@ packages = ["pandaserver"] "templates/bin" = "usr/bin" "templates/init.d" = "etc/rc.d/init.d" "templates/systemd" = "etc/systemd/system" -"templates/sysconfig" = "etc/sysconfig" +"templates/sysconfig" = "etc/panda" [tool.hatch.build.targets.wheel.hooks.custom] path = "package/hatch_build.py" From 0f1a9c626157c4ca852b5a128987c9312fd2ee52 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Thu, 25 Jan 2024 10:17:30 +0100 Subject: [PATCH 5/5] Fixed Dockerfile --- Dockerfile | 3 +-- PandaPkgInfo.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d70a0f86..dcd46ddda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,10 @@ RUN mkdir /tmp/python && cd /tmp/python && \ wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \ tar -xzf Python-*.tgz && rm -f Python-*.tgz && \ cd Python-* && \ - ./configure --enable-shared && \ + ./configure --enable-shared --enable-optimizations --with-lto && \ make altinstall && \ echo /usr/local/lib > /etc/ld.so.conf.d/local.conf && ldconfig && \ cd / && rm -rf /tmp/pyton - # ./configure --enable-shared --enable-optimizations --with-lto && \ # install postgres RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py index 0df5ece36..1997a7884 100644 --- a/PandaPkgInfo.py +++ b/PandaPkgInfo.py @@ -1 +1 @@ -release_version = "0.2.0" +release_version = "0.2.1"