diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js index 11306fe7..28a64155 100644 --- a/backend/internal/certificate.js +++ b/backend/internal/certificate.js @@ -11,7 +11,7 @@ const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env. const le_staging = process.env.NODE_ENV !== 'production'; const internalNginx = require('./nginx'); const internalHost = require('./host'); -const certbot_command = '/usr/bin/certbot'; +const certbot_command = '/opt/certbot/bin/certbot'; const le_config = '/etc/letsencrypt.ini'; const dns_plugins = require('../global/certbot-dns-plugins'); @@ -805,7 +805,7 @@ const internalCertificate = { const credentials_loc = '/etc/letsencrypt/credentials/credentials-' + certificate.id; const credentials_cmd = 'mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentials_loc + '\' && chmod 600 \'' + credentials_loc + '\''; - const prepare_cmd = 'pip3 install ' + dns_plugin.package_name + '==' + dns_plugin.package_version + ' ' + dns_plugin.dependencies; + const prepare_cmd = 'pip install ' + dns_plugin.package_name + '==' + dns_plugin.package_version + ' ' + dns_plugin.dependencies; // Whether the plugin has a ---credentials argument const has_config_arg = certificate.meta.dns_provider !== 'route53' && certificate.meta.dns_provider !== 'duckdns'; diff --git a/backend/setup.js b/backend/setup.js index 9a59f9ac..b25ffc00 100644 --- a/backend/setup.js +++ b/backend/setup.js @@ -187,7 +187,7 @@ const setupCertbotPlugins = () => { }); if (plugins.length) { - const install_cmd = 'pip3 install ' + plugins.join(' '); + const install_cmd = 'pip install ' + plugins.join(' '); promises.push(utils.exec(install_cmd)); } diff --git a/docker/Dockerfile b/docker/Dockerfile index b05d4b64..d85782b6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,16 +20,10 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1 \ RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \ && apt-get update \ - && apt-get install -y --no-install-recommends jq python3 python3-pip python3-setuptools libaugeas0 \ + && apt-get install -y --no-install-recommends jq \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Certbot -RUN pip3 install --upgrade pip \ - && pip install certbot \ - && ln -s /usr/local/bin/certbot /usr/bin/certbot \ - && echo "Certbot version: $(certbot --version)" - # s6 overlay COPY scripts/install-s6 /tmp/install-s6 RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6 @@ -47,7 +41,7 @@ RUN yarn install COPY docker/rootfs / # Remove frontend service not required for prod, dev nginx config as well -RUN rm -rf /etc/services.d/frontend RUN rm -f /etc/nginx/conf.d/dev.conf +RUN rm -rf /etc/services.d/frontend /etc/nginx/conf.d/dev.conf VOLUME [ "/data", "/etc/letsencrypt" ] ENTRYPOINT [ "/init" ] diff --git a/docker/rootfs/root/.bashrc b/docker/rootfs/root/.bashrc index 0dd0d2d2..1deb975c 100644 --- a/docker/rootfs/root/.bashrc +++ b/docker/rootfs/root/.bashrc @@ -17,4 +17,6 @@ alias h='cd ~;clear;' echo -e -n '\E[1;34m' figlet -w 120 "NginxProxyManager" echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev} (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}\E[1;36m, OpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, ${ID:-debian} \E[1;32m${VERSION:-unknown}\E[1;36m, Certbot \E[1;32m$(certbot --version)\E[0m" -echo +echo -e -n '\E[1;34m' +cat /built-for-arch +echo -e '\E[0m'