diff --git a/jenkins-agent/Dockerfile b/jenkins-agent/Dockerfile index 91236d5..f08aea2 100644 --- a/jenkins-agent/Dockerfile +++ b/jenkins-agent/Dockerfile @@ -31,6 +31,9 @@ RUN apt-get install -y apt-transport-https ca-certificates curl gnupg \ && apt-get update \ && apt-get install -y kubectl +# Docker +COPY --from=docker:26.1.3-cli /usr/local/bin/docker /usr/local/bin/ + # Docker compose RUN curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` \ -o /usr/local/bin/docker-compose \ diff --git a/phpldapadmin/Dockerfile b/phpldapadmin/Dockerfile index d04e37b..f36baba 100644 --- a/phpldapadmin/Dockerfile +++ b/phpldapadmin/Dockerfile @@ -11,9 +11,9 @@ RUN echo "deb http://ftp.es.debian.org/debian stretch-backports main" \ php-xml \ && rm -rf /var/lib/apt/lists/* \ && . /etc/apache2/envvars \ - && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \ - && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \ - && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" + && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" COPY apache.conf /etc/apache2/sites-available/phpldapadmin.conf diff --git a/reprepro/Dockerfile b/reprepro/Dockerfile index 9d39a9c..7642085 100644 --- a/reprepro/Dockerfile +++ b/reprepro/Dockerfile @@ -1,7 +1,23 @@ -FROM php:7.4.1-apache +FROM debian:bookworm-slim +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update \ - && apt-get install -y --no-install-recommends reprepro \ - && rm -rf /var/lib/apt/lists/* + && apt-get install -y --no-install-recommends \ + apache2 \ + reprepro \ + openssh-server \ + && rm -rf /var/lib/apt/lists/* \ + && . /etc/apache2/envvars \ + && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \ + && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" COPY apache.conf /etc/apache2/conf-enabled/reprepro.conf + +WORKDIR /reprepro +COPY entrypoint.sh ./ + +EXPOSE 80 + +ENTRYPOINT [ "/reprepro/entrypoint.sh" ] +CMD ["apachectl", "-D", "FOREGROUND"] diff --git a/reprepro/entrypoint.sh b/reprepro/entrypoint.sh new file mode 100755 index 0000000..54c7a76 --- /dev/null +++ b/reprepro/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +service ssh start +exec $@ \ No newline at end of file