Merge pull request #3183 from aledbf/remove_ceph_apache2

Proposal ref(store): remove apache2 from ceph gateway

Author: carmstrong

store/base/templates/ceph.conf

@@ -12,6 +12,8 @@ osd pool default pg_num = {{ .deis_store_pgNum }}
 osd pool default pgp_num = {{ .deis_store_pgNum }}
 osd recovery delay start = {{ .deis_store_delayStart }}
 log file = /dev/stdout
+rgw_frontends = "civetweb port=8888"
+rgw_thread_pool_size = 512
 
 [client.radosgw.gateway]
 host = deis-store-gateway

store/gateway/Dockerfile.template

@@ -1,30 +1,11 @@
 #FROM is generated dynamically by the Makefile
 
-# install Apache and RADOS gateway
-RUN curl -sSL https://raw.github.com/ceph/ceph/master/keys/autobuild.asc | apt-key add -
-RUN echo deb http://gitbuilder.ceph.com/apache2-deb-trusty-x86_64-basic/ref/master trusty main > /etc/apt/sources.list.d/ceph-apache.list
-RUN echo deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-trusty-x86_64-basic/ref/master trusty main > /etc/apt/sources.list.d/ceph-fastcgi.list
+ADD build.sh /tmp/build.sh
 
-RUN apt-get update && apt-get install -yq apache2 libapache2-mod-fastcgi radosgw radosgw-agent
-
-# enable required Apache modules
-RUN a2enmod rewrite
-RUN a2enmod fastcgi
-
-# change the default port
-RUN sed -i 's/80/8888/' /etc/apache2/ports.conf
-
-# set the ServerName
-RUN echo "ServerName deis-store-gateway" > /etc/apache2/conf-available/servername.conf
-RUN a2enconf servername.conf
-
-# create gateway site, and disable the default site
-ADD s3gw.fcgi /var/www/s3gw.fcgi
-ADD rgw.conf /etc/apache2/sites-available/rgw.conf
-RUN a2ensite rgw.conf
-RUN a2dissite 000-default.conf
+RUN DOCKER_BUILD=true /tmp/build.sh
 
 WORKDIR /app
 EXPOSE 8888
 CMD ["/app/bin/boot"]
 ADD bin/boot /app/bin/boot
+

store/gateway/bin/boot

@@ -98,12 +98,8 @@ etcdctl --no-sync -C $ETCD set $ETCD_PATH/secretKey ${SECRET_KEY} >/dev/null
 echo "Starting RADOS gateway..."
 /etc/init.d/radosgw start
 
-echo "Starting Apache..."
-/usr/sbin/apache2ctl start
-
 # smart shutdown on SIGINT and SIGTERM
 function on_exit() {
-  /usr/sbin/apache2ctl stop
   /etc/init.d/radosgw stop
   exit 0
 }
@@ -146,3 +142,4 @@ if [[ ! -z $EXTERNAL_PORT ]]; then
 fi
 
 wait
+

store/gateway/build.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# fail on any command exiting non-zero
+set -eo pipefail
+
+if [[ -z $DOCKER_BUILD ]]; then
+  echo
+  echo "Note: this script is intended for use by the Dockerfile and not as a way to build the store dashboard locally"
+  echo
+  exit 1
+fi
+
+DEBIAN_FRONTEND=noninteractive
+
+apt-get update && apt-get install -yq radosgw radosgw-agent
+
+# cleanup. indicate that python is a required package.
+apt-get clean -y && \
+  rm -Rf /usr/share/man /usr/share/doc && \
+  rm -rf /tmp/* /var/tmp/* && \
+  rm -rf /var/lib/apt/lists/*
+