fix: added missing ps command to both images

This commit is contained in:
Dominik Meyer 2024-07-31 22:09:14 +02:00
parent 0c85a0c273
commit 1b9841e028
Signed by: byterazor
GPG Key ID: EABDA0FD5981BC97
2 changed files with 9 additions and 5 deletions

View File

@ -5,7 +5,7 @@ ARG AMANDA_VERSION=tag-community-3.5.4
RUN apt-get -qy update && apt-get -qy upgrade RUN apt-get -qy update && apt-get -qy upgrade
RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \
flex perl libperl-dev libglib2.0-dev swig \ flex perl libperl-dev libglib2.0-dev swig \
libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
WORKDIR /src WORKDIR /src
RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
@ -21,7 +21,7 @@ FROM debian:stable-slim
RUN apt-get -qy update && apt-get -qy upgrade RUN apt-get -qy update && apt-get -qy upgrade
RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \
libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd procps
RUN apt-get -qy install tini RUN apt-get -qy install tini

View File

@ -5,14 +5,13 @@ ARG AMANDA_VERSION=tag-community-3.5.4
RUN apt-get -qy update && apt-get -qy upgrade RUN apt-get -qy update && apt-get -qy upgrade
RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \
flex perl libperl-dev libglib2.0-dev swig \ flex perl libperl-dev libglib2.0-dev swig \
libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
WORKDIR /src WORKDIR /src
RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
RUN cd amanda && ./autogen RUN cd amanda && ./autogen
RUN cd amanda && ./configure --without-client --without-bsd-security --with-ssl-security --with-ssh-security --with-readline --with-ipv6 --with-user=backup --with-group=backup RUN cd amanda && ./configure --without-client --without-bsd-security --with-ssl-security --with-ssh-security --with-readline --with-ipv6 --with-user=backup --with-group=backup
RUN cd amanda && make RUN cd amanda && make
@ -22,10 +21,15 @@ FROM debian:stable-slim
RUN apt-get -qy update && apt-get -qy upgrade RUN apt-get -qy update && apt-get -qy upgrade
RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \
libxslt1.1 libxml-simple-perl libjson-perl libxslt1.1 libxml-simple-perl libjson-perl procps
COPY --from=builder /usr/local/ /usr/local/ COPY --from=builder /usr/local/ /usr/local/
RUN mkdir /usr/local/etc/amanda/ssl
RUN mkdir /usr/local/etc/amanda/Backup/
COPY conf/amanda.conf /usr/local/etc/amanda/Backup
RUN chown backup:backup /usr/local/etc/amanda
ENV LD_LIBRARY_PATH /usr/local/share/perl5/site_perl/auto/Amanda/Debug/ ENV LD_LIBRARY_PATH /usr/local/share/perl5/site_perl/auto/Amanda/Debug/
USER backup USER backup