Isolating server / UI code. Faster build times. (7645b905) · Commits · e / infra / docker-welcome

Dockerfile

+13 −9

Original line number	Diff line number	Diff line
		FROM jekyll/jekyll:latest AS build
		WORKDIR /tmp
		COPY htdocs /tmp
		COPY frontend/ /tmp
		COPY --chown=jekyll:jekyll Gemfile Gemfile.lock /tmp/
		RUN jekyll build -d ./build && rm /tmp/Gemfile*

		FROM php:7.4-apache
		FROM php:7.4-apache as server
		RUN a2enmod rewrite && a2enmod env && a2enmod remoteip
		ARG DOMAIN=ecloud.global
		ARG TRUSTED_PROXY=front-proxy
		LABEL maintainer="dev@e.email"

		# configure the remoteip module
		RUN echo "RemoteIPHeader X-Forwarded-For" > /etc/apache2/conf-available/remoteip.conf
		RUN echo "RemoteIPTrustedProxy front-proxy" >> /etc/apache2/conf-available/remoteip.conf
		RUN echo "RemoteIPTrustedProxy $TRUSTED_PROXY" >> /etc/apache2/conf-available/remoteip.conf
		RUN ln -s /etc/apache2/conf-available/remoteip.conf /etc/apache2/conf-enabled/remoteip.conf

		# replace %h = host always pointing to haproxy ip by %a in LogFormat to get real users ip
		@@ -20,14 +21,9 @@ RUN sed -i 's/"%h/"%a/g' /etc/apache2/apache2.conf
		RUN sed -i 's/ServerTokens OS/ServerTokens Prod/g' /etc/apache2/conf-enabled/security.conf
		RUN sed -i 's/ServerSignature On/ServerSignature Off/g' /etc/apache2/conf-enabled/security.conf


		COPY --chown=www-data:www-data --from=build /tmp/build/ /var/www/html/
		COPY --chown=www-data:www-data /private /var/private/
		COPY htdocs/.htaccess /var/www/html/.htaccess
		# Use the default production configuration
		RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
		RUN echo 'error_log = /var/log/errors.log' >> "$PHP_INI_DIR/php.ini"
		RUN chmod u+x /var/private/generate-signup-link.sh

		# copy composer executable from official Docker image
		# https://hub.docker.com/_/composer
		@@ -42,6 +38,14 @@ RUN apt-get remove -y git unzip
		RUN rm -rf /var/lib/apt/lists/* && rm /usr/bin/composer
		RUN chown -R www-data:www-data /var/www/html/vendor/ /var/www/html/composer.lock /var/www/html/composer.json
		RUN pecl install yaml && echo "extension=yaml.so" > /usr/local/etc/php/conf.d/ext-yaml.ini

		RUN mkdir /var/accounts/
		RUN touch /var/accounts/auth.file /var/accounts/auth.file.done
		RUN chown -R www-data:www-data /var/accounts

		COPY --chown=www-data:www-data --from=build /tmp/build/ /var/www/html/
		COPY --chown=www-data:www-data /private /var/private/
		COPY htdocs/.htaccess /var/www/html/.htaccess
		RUN chmod u+x /var/private/generate-signup-link.sh

		COPY --chown=www-data:www-data htdocs /var/www/html/

htdocs/_config.yml→frontend/_config.yml

+0 −0

File moved.

View file

htdocs/_i18n/de.yml→frontend/_i18n/de.yml

+0 −0

File moved.

View file

htdocs/_i18n/en.yml→frontend/_i18n/en.yml

+0 −0

File moved.

View file

htdocs/_i18n/es.yml→frontend/_i18n/es.yml

+0 −0

File moved.

View file