refs #7442 jenkins agent & reprepro fixes

This commit is contained in:
Juan Ferrer 2024-07-03 13:42:22 +02:00
parent 3e955e2601
commit ca553c8a41
4 changed files with 29 additions and 6 deletions

View File

@ -31,6 +31,9 @@ RUN apt-get install -y apt-transport-https ca-certificates curl gnupg \
&& apt-get update \ && apt-get update \
&& apt-get install -y kubectl && apt-get install -y kubectl
# Docker
COPY --from=docker:26.1.3-cli /usr/local/bin/docker /usr/local/bin/
# Docker compose # Docker compose
RUN curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` \ 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 \ -o /usr/local/bin/docker-compose \

View File

@ -1,7 +1,23 @@
FROM php:7.4.1-apache FROM debian:bookworm-slim
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends reprepro \ && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* 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 COPY apache.conf /etc/apache2/conf-enabled/reprepro.conf
WORKDIR /reprepro
COPY entrypoint.sh ./
EXPOSE 80
ENTRYPOINT [ "/reprepro/entrypoint.sh" ]
CMD ["apachectl", "-D", "FOREGROUND"]

4
reprepro/entrypoint.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
service ssh start
exec $@