Skip to content

Commit

Permalink
fedora 30 dev: restructure docker build, add "ip" tool
Browse files Browse the repository at this point in the history
  • Loading branch information
rgerhards committed Jun 28, 2019
1 parent a9ea794 commit 3c41422
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 340 deletions.
71 changes: 65 additions & 6 deletions dev_env/fedora/base/30/Dockerfile
Expand Up @@ -24,7 +24,7 @@ RUN dnf -y update && \
gnutls-devel \
hiredis \
hiredis-devel \
hiredis-devel \
iproute \
java-1.8.0-openjdk \
java-1.8.0-openjdk-devel \
libcurl-devel \
Expand Down Expand Up @@ -80,12 +80,12 @@ RUN mkdir /local_dep_cache && \
# to adjust test sources.
ENV ELASTICSEARCH_NEWEST="elasticsearch-6.3.1.tar.gz"
WORKDIR /home/devel
VOLUME /rsyslog
RUN groupadd rsyslog \
&& adduser -g rsyslog -s /bin/bash rsyslog \
&& echo "rsyslog ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
ADD setup-system.sh setup-system.sh
ADD common/setup-projects.sh setup-projects.sh
RUN mkdir /rsyslog && \
chown rsyslog:rsyslog /rsyslog
VOLUME /rsyslog
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig \
LD_LIBRARY_PATH=/usr/local/lib \
LIBDIR_PATH=/usr/lib64
Expand All @@ -105,6 +105,67 @@ RUN cd helper-projects && \
rm -r codestyle && \
cd ..


# libestr
RUN cd helper-projects && \
git clone https://github.com/rsyslog/libestr.git && \
cd libestr && \
autoreconf -fi && \
./configure --prefix=/usr/local && \
make -j4 && \
make install && \
cd .. && \
rm -r libestr && \
cd ..

# liblogging
RUN cd helper-projects && \
git clone https://github.com/rsyslog/liblogging.git && \
cd liblogging && \
autoreconf -fi && \
./configure --prefix=/usr --libdir=/usr/lib64 --disable-journal && \
make -j4 && \
make install && \
cd .. && \
rm -r liblogging && \
cd ..

# liblfastjson
RUN cd helper-projects && \
git clone https://github.com/rsyslog/libfastjson.git && \
cd libfastjson && \
autoreconf -fi && \
./configure --prefix=/usr --libdir=/usr/lib64 && \
make -j4 && \
make install && \
cd .. && \
rm -r libfastjson && \
cd ..

# liblognorm
RUN cd helper-projects && \
git clone https://github.com/rsyslog/liblognorm.git && \
cd liblognorm && \
autoreconf -fi && \
./configure --enable-compile-warnings=yes --prefix=/usr/local && \
make -j4 && \
make install && \
cd .. && \
rm -r liblognorm && \
cd ..

# librelp
RUN cd helper-projects && \
git clone https://github.com/rsyslog/librelp.git && \
cd librelp && \
autoreconf -fi && \
./configure --prefix=/usr --enable-compile-warnings=yes --libdir=/usr/lib64 && \
make -j4 && \
make install && \
cd .. && \
rm -r librelp && \
cd ..

# we need Guardtime libksi here, otherwise we cannot check the KSI component
RUN cd helper-projects && \
git clone https://github.com/guardtime/libksi.git && \
Expand Down Expand Up @@ -201,7 +262,5 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
# build errors at the moment: --enable-kmsg
# --enable-mmgrok - no package

# Install any needed packages
RUN ./setup-projects.sh
WORKDIR /rsyslog
USER rsyslog
206 changes: 0 additions & 206 deletions dev_env/fedora/base/30/Dockerfile.NEXT

This file was deleted.

16 changes: 14 additions & 2 deletions dev_env/fedora/base/30/build.sh
@@ -1,3 +1,15 @@
#cp -r ../../../common/ common
set -e
docker build $1 -t rsyslog/rsyslog_dev_base_fedora:30 .
#rm -r common
printf "\n\n================== BUILD DONE, NOW TESTING CONTAINER:\n"
docker run -ti rsyslog/rsyslog_dev_base_fedora:30 bash -c "
set -e && \
git clone https://github.com/rsyslog/rsyslog.git && \
cd rsyslog && \
autoreconf -fi && \
./configure \$RSYSLOG_CONFIGURE_OPTIONS --enable-compile-warnings=yes && \
make -j4
"
if [ $? -eq 0 ]; then
printf "\nREADY TO PUSH!\n"
printf "\ndocker push rsyslog/rsyslog_dev_base_fedora:30\n"
fi
63 changes: 0 additions & 63 deletions dev_env/fedora/base/30/common/common/setup-projects.sh

This file was deleted.

0 comments on commit 3c41422

Please sign in to comment.