Merge pull request #4459 from bgeuken/docker_layers

Docker refactoring
openSUSE · Feb 8, 2018 · 5de5680 · 5de5680
2 parents d2a9d9c + aaca28a
commit 5de5680
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 25 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+src/api/tmp/*
+src/backend/t/tmp/*
+src/api/log/*
+src/auth-proxy/
+docs
+
diff --git a/Dockerfile.42.3 b/Dockerfile.42.3
@@ -1,9 +1,5 @@
 FROM opensuse:42.3
 
-# FIXME: Temporarily fix pam
-# See https://github.com/openSUSE/docker-containers/issues/82
-RUN sed -i 's/.*root.*-.*nproc.*unlimited.*$//g' /etc/security/limits.conf
-
 # Add our repo
 RUN echo 'solver.allowVendorChange = true' >> /etc/zypp/zypp.conf; \
     zypper ar -f http://download.opensuse.org/repositories/OBS:/Server:/Unstable/openSUSE_42.3/OBS:Server:Unstable.repo; \

diff --git a/Dockerfile.backend b/Dockerfile.backend
@@ -1,17 +1,9 @@
 FROM openbuildservice/base
 
-# FIXME: https://bugzilla.opensuse.org/show_bug.cgi?id=957818
-RUN rm -rf /var/cache/zypp/*
-
 RUN /root/bin/docker-bootstrap.sh backend
 
 # Add our sign configuration
-ADD dist/obs-signd-conf.tar.bz2 sign
-RUN rm -rf /root/.gnupg; \
-    mv -v /sign/root/.gnupg /root/.gnupg; \
-    mv -v /sign/root/.phrases /root/.phrases; \
-    mv -v /sign/etc/ourkeyfile.asc /sign/etc/sign.conf /etc/; \
-    mv -v /sign/etc/sysconfig/signd /etc/sysconfig/signd
+ADD dist/obs-signd-conf.tar.bz2 /
 
 # Run our command
 WORKDIR /obs

diff --git a/Dockerfile.frontend-base b/Dockerfile.frontend-base
@@ -1,8 +1,5 @@
 FROM openbuildservice/base
 
-# FIXME: https://bugzilla.opensuse.org/show_bug.cgi?id=957818
-RUN rm -rf /var/cache/zypp/*
-
 RUN /root/bin/docker-bootstrap.sh frontend
 
 # Install other requirements

diff --git a/Dockerfile.mariadb b/Dockerfile.mariadb
@@ -1,8 +1,5 @@
 FROM openbuildservice/base
 
-# FIXME: https://bugzilla.opensuse.org/show_bug.cgi?id=957818
-RUN rm -rf /var/cache/zypp/*
-
 # Install mariadb and dependencies
 RUN zypper -n install --no-recommends --replacefiles mariadb hostname
 

diff --git a/Dockerfile.memcached b/Dockerfile.memcached
@@ -1,8 +1,5 @@
 FROM openbuildservice/base
 
-# FIXME: https://bugzilla.opensuse.org/show_bug.cgi?id=957818
-RUN rm -rf /var/cache/zypp/*
-
 # Install memcached
 RUN /root/bin/docker-bootstrap.sh memcached
 

diff --git a/Dockerfile.old-test-suite b/Dockerfile.old-test-suite
@@ -1,8 +1,5 @@
 FROM openbuildservice/base
 
-# FIXME: https://bugzilla.opensuse.org/show_bug.cgi?id=957818
-RUN rm -rf /var/cache/zypp/*
-
 RUN /root/bin/docker-bootstrap.sh memcached
 RUN /root/bin/docker-bootstrap.sh backend
 RUN /root/bin/docker-bootstrap.sh frontend