docker image: use gitlab.com built base image

[projects/cleanbuild.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d5894f31fa744996b43f2a31b00d5a76b14f05b5..bf46e731ced2c3d435ffa4ec8bf17dc2aec20679 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # create base image for cleanbuild
 
-FROM glen/pld
+FROM registry.gitlab.com/pld-linux/pld
 
 RUN set -x \
        # first upgrade to latest
@@ -12,13 +12,15 @@ RUN set -x \
        # for builder -R
        && echo 'builder ALL = NOPASSWD:/usr/bin/poldek -q --update --upa' > /etc/sudoers.d/builder \
        && echo 'builder ALL = NOPASSWD:/usr/bin/poldek --noask --caplookup --uniq -uG *' >>  /etc/sudoers.d/builder \
+       # configures empty dir
+       && rm /etc/poldek/repos.d/pld-builder.conf \
        # preserve downloaded packages
-       # init rpm dir and replace system package
-       && sudo -H -u builder builder --init-rpm-dir \
-       && ln -snf ~builder/rpm/rpm-build-tools/builder.sh /usr/bin/builder \
        && poldek-config keep_downloads yes \
        && poldek --clean-whole
 
+# overwrite with our config (it defines same path, but disabled)
+COPY localrpms.conf /etc/poldek/source.conf
+
 # switch user
 USER builder