From e9d4d11177c2c4701becc26fa3b247e6292878f4 Mon Sep 17 00:00:00 2001 From: jknapp Date: Mon, 21 Jul 2025 16:05:37 -0700 Subject: [PATCH] Fix package conflict by removing curl dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove curl from package installation to avoid curl/curl-minimal conflict - Replace curl with wget in health check and Node.js installation scripts - wget is already installed and provides same functionality 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- Dockerfile | 4 ++-- scripts/install-node18.sh | 2 +- scripts/install-node20.sh | 2 +- scripts/install-node22.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 619d031..b166b9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG NODEVER=20 RUN dnf install -y \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ dnf update -y && \ - dnf install -y wget procps cronie iproute nginx openssl curl && \ + dnf install -y wget procps cronie iproute nginx openssl && \ dnf clean all && \ rm -rf /var/cache/dnf /usr/share/doc /usr/share/man /usr/share/locale/* \ /var/cache/yum /tmp/* /var/tmp/* @@ -35,6 +35,6 @@ COPY ./configs/ecosystem.config.js /var/www/html/ RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \ - CMD curl -f http://localhost:3000/ping || exit 1 + CMD wget --spider -q http://localhost:3000/ping || exit 1 ENTRYPOINT [ "/scripts/entrypoint.sh" ] \ No newline at end of file diff --git a/scripts/install-node18.sh b/scripts/install-node18.sh index c1b1675..9d15e0c 100755 --- a/scripts/install-node18.sh +++ b/scripts/install-node18.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -curl -fsSL https://rpm.nodesource.com/setup_18.x | bash - +wget -qO- https://rpm.nodesource.com/setup_18.x | bash - dnf install -y nodejs npm install -g npm@latest node --version diff --git a/scripts/install-node20.sh b/scripts/install-node20.sh index d2f6070..0f2c276 100755 --- a/scripts/install-node20.sh +++ b/scripts/install-node20.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -curl -fsSL https://rpm.nodesource.com/setup_20.x | bash - +wget -qO- https://rpm.nodesource.com/setup_20.x | bash - dnf install -y nodejs npm install -g npm@latest node --version diff --git a/scripts/install-node22.sh b/scripts/install-node22.sh index 32a4f65..872fc18 100755 --- a/scripts/install-node22.sh +++ b/scripts/install-node22.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -curl -fsSL https://rpm.nodesource.com/setup_22.x | bash - +wget -qO- https://rpm.nodesource.com/setup_22.x | bash - dnf install -y nodejs npm install -g npm@latest node --version