Add self-signed SSL certificate and docker-compose.yml file

Dockerfile

@@ -37,17 +37,6 @@ RUN pip install --upgrade pip mod_wsgi && \
 COPY ./requirements/ /Kiwi/requirements/
 RUN pip install -r /Kiwi/requirements/mysql.txt
 
-# now remove -devel RPMs used to build Python dependencies
-# and also remove everything else, including YUM, that we don't need
-RUN rpm -qa | grep "\-devel" | grep -v python-devel | xargs yum -y remove && \
-    yum -y remove gcc cpp centos-release-scl perl-* *-headers pygobject3-base \
-           gobject-introspection bind-license iso-codes xml-common && \
-    yum clean all
-RUN rpm -qa | grep yum | xargs rpm -ev && \
-    rpm -qa | grep "^python-" | xargs rpm -ev --nodeps && \
-    rpm -ev dbus-python libxml2-python rpm-python pyliblzma pygpgme pyxattr && \
-    rm -rf /anaconda-post.log /var/cache/yum /etc/yum* /usr/lib64/python2.7
-
 # Add manage.py
 COPY ./manage.py /Kiwi/
 RUN sed -i "s/tcms.settings.devel/tcms.settings.product/" /Kiwi/manage.py
@@ -64,6 +53,3 @@ RUN find /venv/lib64/python3.5/site-packages/tcms/ -name "*.pyc" -delete
 
 # collect static files
 RUN /Kiwi/manage.py collectstatic --noinput
-
-# todo: remove static & node_modules from under tcms directory
-# todo: remove npm & friends

Makefile

@@ -85,7 +85,7 @@ endif
 docker-image:
 	docker build -t $(DOCKER_ORG)/kiwi:$(KIWI_VERSION) .
 
-docker-run: docker-image
+run:
 	docker compose up
 
 

contrib/ssl/kiwi-https.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC3jCCAcYCCQCyy9Yqn7vpczANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJC
+RzEOMAwGA1UEBwwFU29maWExEjAQBgNVBAoMCUtpd2kgVENNUzAeFw0xNzA4MzAw
+OTQ5MDNaFw0xODA4MzAwOTQ5MDNaMDExCzAJBgNVBAYTAkJHMQ4wDAYDVQQHDAVT
+b2ZpYTESMBAGA1UECgwJS2l3aSBUQ01TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAv7DkcTz0cIJwANNhCZ/L2WBNIlche6AGB5b5baN0uMddI35Ik1uX
++pIW1H5nsmkdPz9w1iUyuahITRE6Z44Hp8NLQs36t+DMKbeRc6mO7CQ8KF3XiIzD
+twoAkeHgFnB8R+GcKKh/a4pb0EYBzEfUeQNneEXR0hvI2Dt82I6DNy4EuohG3uSm
+nSC27VLaTuY8ETZWUSvHza5ZerB4EgdcRJOJHTJs4SXs2kd7BdMtpLHFCRHoN9W9
+Rc4baFJX4citwo1HnMI1ZV05XfHthKEmvk2sKgic7pbt2o0F8/Su0RouJpIPt7jv
++MIW28UZ3mOM5QEHFwUUFv3+SNd7IY7q0wIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQBcuLbUyHVNgTcbWrX1qqhBn4S15+KMffCkx8eIrx6tTLWY8iX5ClsLZIvUORf7
+CZOjpKT5zyoH7ILXcRsgUEEJIcIq3MemDvm5DwQEA3Fu4iFwhtumBmGLVF1nStwp
+mzplhz0BTxDi8feGZ1ibfxfFUhs4jFe0JaPRiBVRrUCscz3a9NaFFjL06Caw4QIW
+kRXBL6FJc5Zzyssv5JzVLDI+Bj7fQ7HhLq4AfKzlnNWaaACQruiJK6jjtyseNBYC
+93UbMpksdImzqoVzGi8dEP7jqFaNvqBthAvE4VeH3VSQ28sI3mbNlx173j0sKK7b
+025FhkdegAPK2kRId7qSeQHb
+-----END CERTIFICATE-----

contrib/ssl/kiwi-https.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAv7DkcTz0cIJwANNhCZ/L2WBNIlche6AGB5b5baN0uMddI35I
+k1uX+pIW1H5nsmkdPz9w1iUyuahITRE6Z44Hp8NLQs36t+DMKbeRc6mO7CQ8KF3X
+iIzDtwoAkeHgFnB8R+GcKKh/a4pb0EYBzEfUeQNneEXR0hvI2Dt82I6DNy4EuohG
+3uSmnSC27VLaTuY8ETZWUSvHza5ZerB4EgdcRJOJHTJs4SXs2kd7BdMtpLHFCRHo
+N9W9Rc4baFJX4citwo1HnMI1ZV05XfHthKEmvk2sKgic7pbt2o0F8/Su0RouJpIP
+t7jv+MIW28UZ3mOM5QEHFwUUFv3+SNd7IY7q0wIDAQABAoIBABIO+hZo5aZLw31w
+bG3ZrfyWg+2+Q5s/4hGI+YqIoZBex7l2RiQLtu+WH6x5FA/Ms0KoGVszOeofnmAU
+RWpICRSW41oxyXLVLKapcnxw9tPsPfaXkJx+llmCCbe0jcXPZwXmjS2PYiGhcTDX
+x4eVJMEZvv+npDKlB3DHeeV014u1EluQTdzM8IayIjFDWA0YhREx26cSLA/pqFWM
+h5YizMqeMwYGac5GZLdGxWwedZqc8gkyf+qWo64UsVon3DKXgQAVkI3p3b8Z4Eqg
+9ByJ9SrcEtR28w2yr47b6/aATZTqfJxOUyhnTtOpiTO9N69CSTTb3N9sPePffvv6
+9xl8y0ECgYEA5nKOpM01ODCsSEh6NdrRmhNghjae+4n+SP0Y3mRtMP/ctOpWqmIr
+oCmiPavV5sDVCsVBqNh9DxsUt2xUy0yRdSuLDtuan8CHkjibq0eLDev3ZosBH1zO
+0MGlAA00lxJTkI+YJsF5hA9BUy9RqDgBqhyE7w+MyP1xbBuhS8l8ijECgYEA1PIz
+IFLANfbq+6Wx3D77lOaTrw9HbDrTdvCpN4vVlxl3pv5OIAK+Iqi0oqczW5Plfbij
+K9bSvWVWz+wElVrDeEvE6T9v6Yb++fhryhitiVJTtsvR2xX6+sinOM1HwpwxHYPy
+YsDnzFFQdtQ9O4+UCcuCPd/IrfIZwzWBsBzywEMCgYEAoHLWekweZ9cLvPApluGZ
+2krvg8L4Am7by3ndHMqTc/BRfO1EFjFv6n3SZloD/jv4mR0qUCMbP689R1B34WyY
+QhplIZ0pFV15hwc+64xOdwz6Hj1eNLXrkVGiTlzjZuPtptMzvpgqwRXWB9MEablE
+/2oH7GLJRQ+hLwI11Yyd16ECgYBI/2XrVLKzTRusfFaGS8jueER0JGa1gUzwXvuD
+IRptG7vasR6S9p27P938TBjc8cwf1uWIp7HCXzTtPdksYdrUKBUuaCKzCSXrBu/c
+ba0/f8tWxHQCCHzq71HztNs+qVBk79BtbfeIIO/WbFc5TbTPzsWs9EPU7UNLmdIF
+T0cgBQKBgQCDc195c7+KmKyXMXv8CdPioeXdxEHBzQndQwsby4agFkfQEZSVBo/m
+d+3dkuJFXELdWfvtKGr12if8bbba+ybXo5YkGCCFE1bcU4oSVTm/W4wAXNuZcc0M
+UHLrIDsNk451sIkyKEfPHMnmfx2leWYIAcWbXa6ffDM4ralEkvTyxg==
+-----END RSA PRIVATE KEY-----

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '2'
+
+services:
+    db:
+        container_name: kiwi_db
+        image: centos/mariadb
+        volumes:
+            - db_data:/var/lib/mysql
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: kiwi-1s-aw3s0m3
+            MYSQL_DATABASE: kiwi
+            MYSQL_USER: kiwi
+            MYSQL_PASSWORD: kiwi
+
+    web:
+        container_name: kiwi_web
+        depends_on:
+            - db
+        restart: always
+        image: kiwitcms/kiwi:latest
+        ports:
+            - 443:443
+        volumes:
+            - uploads:/var/kiwi/uploads
+            - ./contrib/ssl/kiwi-https.crt:/etc/pki/tls/certs/localhost.crt
+            - ./contrib/ssl/kiwi-https.key:/etc/pki/tls/private/localhost.key
+        environment:
+            KIWI_DB_HOST: db
+            KIWI_DB_PORT: 3306
+            KIWI_DB_NAME: kiwi
+            KIWI_DB_USER: kiwi
+            KIWI_DB_PASSWORD: kiwi
+
+volumes:
+    db_data:
+    uploads:

tcms/settings/common.py

@@ -140,9 +140,6 @@
 # Example: "http://example.com/static/", "http://static.example.com/"
 STATIC_URL = '/static/'
 
-# provides filename versioning
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
-
 # Additional locations of static files
 STATICFILES_DIRS = [
     # Put strings here, like "/home/html/static" or "C:/www/django/static".