docker: Drop support for this

Right now, this won't work and I do not have the tools to make it work.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitignore b/.gitignore
index c4a1742613a72b0f5174701d4cd7edb993d505af..99b2e2c7e0b2cd31d1fb9b8e05cca77d292d7e06 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/Dockerfile
 /Makefile
 /build-aux
 /pbs.conf

diff --git a/Dockerfile.in b/Dockerfile.in
deleted file mode 100644 (file)
index 263ab7f..0000000
--- a/Dockerfile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM ipfire/pakfire:latest
-MAINTAINER jonatanschlag
-
-LABEL \
-       org.ipfire.pakfire.name = "@PACKAGE_NAME@" \
-       org.ipfire.pakfire.url = "https://pakfire.ipfire.org" \
-       org.ipfire.pakfire.vendor = "IPFire Project" \
-       org.ipfire.pakfire.version = "@PACKAGE_VERSION@"
-
-# Install all dependencies
-RUN yum install -y \
-       autoconf \
-       intltool \
-       make \
-       openssl-perl \
-       python2-pip \
-       python-daemon \
-       python-ldap \
-       python-markdown \
-       python-memcached \
-       python-psycopg2 \
-       python-tornado \
-       pytz-2016.10 \
-       && yum clean all
-
-# Install more python dependencies
-RUN pip install geoip2
-
-# Create a user
-RUN groupadd -g 2000 pbs && \
-       useradd --system --no-create-home --shell /bin/bash --uid 2000 --gid 2000 pbs
-
-# Install LDAP certificate
-RUN mkdir -p /etc/openldap/cacerts
-COPY src/misc/lets-encrypt-x3-cross-signed.pem /etc/openldap/cacerts/
-RUN c_rehash -v /etc/openldap/cacerts
-
-# Copy the source code
-COPY . /build/pakfire-build-service
-
-WORKDIR /build/pakfire-build-service
-
-# Compile the build service
-RUN ./autogen.sh && \
-       ./configure --prefix=/usr --sysconfdir=/etc \
-       && make && make check && make install && rm -rf /build/pakfire-build-service
-
-# Go back to /root
-WORKDIR /root
-
-# Cleanup
-RUN yum remove -y *-devel && yum autoremove -y && yum clean all
-
-USER pbs
-
-# Define default command.
-CMD ["/bin/bash"]
-

diff --git a/Makefile.am b/Makefile.am
index ff7fd1bca7dd5a5b08b3f2f9deac017740a0decd..bec950b1d3881b8e2c717e7de7118fc2a8fbbad2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -399,23 +399,6 @@ static_jsdir = $(staticdir)/js
 
 # ------------------------------------------------------------------------------
 
-EXTRA_DIST += \
-       Dockerfile.in
-
-docker_DATA = \
-       Dockerfile
-
-CLEANFILES += \
-       Dockerfile
-
-dockerdir = $(datadir)/docker
-
-.PHONY: docker
-docker: Dockerfile
-       docker build -t "ipfire/pakfire-build-service:$(PACKAGE_VERSION)" .
-
-# ------------------------------------------------------------------------------
-
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
        src/systemd/pakfire-hub.service \
@@ -448,7 +431,6 @@ dist_geoip_DATA = \
 geoipdir = $(datadir)/geoip
 
 EXTRA_DIST += \
-       src/misc/lets-encrypt-x3-cross-signed.pem \
        src/tools/dump-database-schema.sh \
        src/tools/update-geoip-database.sh
 

diff --git a/src/misc/lets-encrypt-x3-cross-signed.pem b/src/misc/lets-encrypt-x3-cross-signed.pem
deleted file mode 100644 (file)
index 0002462..0000000
--- a/src/misc/lets-encrypt-x3-cross-signed.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
------END CERTIFICATE-----