diff --git a/Dockerfile b/Dockerfile index dead75810..fbd27685b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,6 @@ RUN mkdir -p /etc/apt/keyrings \ && apt-get update \ && apt-get upgrade -y \ && apt-get -y --no-install-recommends install lambda-builder "/tmp/dokku-$(dpkg --print-architecture).deb" \ - && apt-get purge -y syslog-ng-core \ && apt-get autoremove -y \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -75,5 +74,4 @@ RUN \ && mv /etc/my_init.d/00_regen_ssh_host_keys.sh /etc/my_init.d/15_regen_ssh_host_keys \ && rm -f /etc/nginx/sites-enabled/default /usr/share/nginx/html/index.html /etc/my_init.d/10_syslog-ng.init \ && rm -f /usr/local/openresty/nginx/conf/sites-enabled/default /usr/share/openresty/html/index.html \ - && sed -i '/imklog/d' /etc/rsyslog.conf \ && rm -f /var/log/btmp /var/log/wtmp /var/log/*log /var/log/apt/* /var/log/dokku/*.log /var/log/nginx/* /var/log/openresty/* diff --git a/debian/control b/debian/control index aa11d1698..9287d26c8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.37.3 Section: web Priority: optional Architecture: amd64 -Depends: apache2-utils, locales, git, cpio, cron, curl, man-db, netcat, sshcommand, docker-engine-cs (>= 19.03.0) | docker-engine (>= 19.03.0) | docker-io (>= 19.03.0) | docker.io (>= 19.03.0) | docker-ce (>= 19.03.0) | docker-ee (>= 19.03.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, parallel, procfile-util, rsync, dos2unix, unzip, util-linux +Depends: apache2-utils, locales, git, cpio, cron, curl, logrotate, man-db, netcat, sshcommand, docker-engine-cs (>= 19.03.0) | docker-engine (>= 19.03.0) | docker-io (>= 19.03.0) | docker.io (>= 19.03.0) | docker-ce (>= 19.03.0) | docker-ee (>= 19.03.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, parallel, procfile-util, rsync, dos2unix, unzip, util-linux Recommends: herokuish, bash-completion, dokku-update, dokku-event-listener Pre-Depends: gliderlabs-sigil, jq, nginx (>= 1.8.0) | openresty, bind9-dnsutils, debconf, plugn, sudo, python3, rsyslog Maintainer: Jose Diaz-Gonzalez diff --git a/tests.mk b/tests.mk index da4a7200f..10de496b0 100644 --- a/tests.mk +++ b/tests.mk @@ -282,6 +282,11 @@ deploy-test-static: @echo deploying static app... cd tests && ./test_deploy ./apps/static $(DOKKU_DOMAIN) +test-ci-binaries: + docker exec dokku bash -c "whereis logrotate" || { echo "logrotate not found" ; exit 1; } + docker exec dokku bash -c "whereis rsyslog" || { echo "rsyslog not found" ; exit 1; } + docker exec dokku bash -c "whereis syslog-ng" && { echo "syslog-ng found" ; exit 1; } + deploy-tests: @echo running deploy tests... @$(QUIET) $(MAKE) deploy-test-checks-root @@ -317,7 +322,7 @@ tests-ci-retry-failed: tar xzf /tmp/bats-retry.tgz -C /usr/local/bin bats-retry --execute test-results/bats -test-ci-docker: setup-docker-deploy-tests deploy-test-checks-root deploy-test-config deploy-test-multi deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy +test-ci-docker: setup-docker-deploy-tests deploy-test-checks-root deploy-test-config deploy-test-multi deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy test-ci-binaries generate-ssl-tars: generate-ssl-tar generate-ssl-sans-tar generate-ssl-wildcard-tar