Merge pull request #217 from damien-carcel/issue-216

Issue 216: Remove "carcel/akeneo-behat"

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2017-06-05
+
+### Enhancement
+
+- **Issue 216:** Fuse `carcel/akeneo` and `carcel/akeneo-behat` into `carcel/akeneo-apache`.
+
 ## 2017-05-11
 
 ### Bug fix

README.md

@@ -20,8 +20,7 @@ This repository contains my own docker images I use for Akeneo and other Symfony
 - [**carcel/php**](php/README.md): Base image with PHP CLI preconfigured, based on `debian:jessie-slim`
 - [**carcel/fpm**](fpm/README.md): An image with PHP FPM preconfigured to be use with any Symfony project, based on `carcel/php`
 - [**carcel/apache-php**](apache-php/README.md): An image with Apache + mod_php preconfigured to be use with any Symfony project, based on `carcel/php`
-- [**carcel/akeneo**](akeneo/README.md): An image for Akeneo development, based on `carcel/apache-php`
-- [**carcel/akeneo-behat**](akeneo-behat/README.md): An image to run Akeneo behat tests, based on `carcel/apache-php`
+- [**carcel/akeneo-apache**](akeneo-apache/README.md): An image for Akeneo development with Apache + `mod_php`, based on `carcel/apache-php`
 - [**carcel/akeneo-fpm**](akeneo-fpm/README.md): An image for Akeneo development with PHP FPM, based on `carcel/fpm`
 
 ## How to use these images?

akeneo-apache/Dockerfile

@@ -0,0 +1,29 @@
+FROM carcel/apache-php:php-5.6
+MAINTAINER Damien Carcel <damien.carcel@gmail.com>
+
+# Define "root" as current user
+USER root
+
+# Add some utilities
+COPY files/pim-assets.sh /usr/local/bin/pim-assets
+COPY files/pim-initialize.sh /usr/local/bin/pim-initialize
+COPY files/pim-cac.sh /usr/local/bin/pim-cac
+RUN chmod +x /usr/local/bin/*
+
+# Disable default VHOST
+RUN a2dissite 000-default.conf
+
+# Add additional ports for VHOSTs
+COPY files/additional-ports.conf /etc/apache2/conf-available/additional-ports.conf
+RUN a2enconf additional-ports
+EXPOSE 81 444
+
+# Add Akeneo VHOSTs
+COPY files/akeneo.dev.conf /etc/apache2/sites-available/akeneo.dev.conf
+COPY files/akeneo-behat.dev.conf /etc/apache2/sites-available/akeneo-behat.dev.conf
+
+# Enable Akeneo VHOSTs
+RUN a2ensite akeneo.dev.conf && a2ensite akeneo-behat.dev.conf
+
+# Define "docker" as current user
+USER docker

akeneo/README.md → akeneo-apache/README.md

@@ -1,17 +1,17 @@
-# Akeneo on Docker
+# Akeneo and Apache on Docker
 
-This is a Docker development environment for Akeneo PIM.
+This is a Docker development environment for Akeneo PIM with Apache and `mod_php`.
 
 This environment is based on [carcel/apache-php](https://hub.docker.com/r/carcel/apache-php/).
 
 ## How to use it?
 
 ### From Docker hub
 
-You can directly pull this image from [Docker hub](https://hub.docker.com/r/carcel/akeneo/) by running:
+You can directly pull this image from [Docker hub](https://hub.docker.com/r/carcel/akeneo-apache/) by running:
 
 ```bash
-$ docker run --name akeneo -p 8080:80 -d carcel/akeneo:php-5.6
+$ docker run --name akeneo -p 8080:80 -d carcel/akeneo-apache:php-5.6
 ```
 
 Access the URL `localhost:8080` with your web browser to check that the container works.
@@ -21,13 +21,13 @@ Access the URL `localhost:8080` with your web browser to check that the containe
 Clone the repository, go inside the created folder, and build the docker image:
 
 ```bash
-$ docker build -t "akeneo" .
+$ docker build -t "akeneo-apache" .
 ```
 
 Then you can run a container like this:
 
 ```bash
-$ docker run --name akeneo -p 8080:80 -d akeneo
+$ docker run --name akeneo -p 8080:80 -d akeneo-apache
 ```
 
 ### Use this image with Docker Compose

akeneo-apache/files/additional-ports.conf

@@ -0,0 +1,9 @@
+Listen 81
+
+<IfModule ssl_module>
+	Listen 444
+</IfModule>
+
+<IfModule mod_gnutls.c>
+	Listen 444
+</IfModule>

akeneo-behat/files/akeneo-behat.dev.conf → akeneo-apache/files/akeneo-behat.dev.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:81>
     ServerName akeneo-behat.dev
 
     RewriteEngine On

akeneo/files/pim-assets.sh → akeneo-apache/files/pim-assets.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 echo "Clean previous assets"
-rm -rf app/cache/prod
-rm -rf app/cache/dev
+rm -rf app/cache/*
 rm -rf web/bundles/*
 rm -rf web/css/*
 rm -rf web/js/*

akeneo/files/pim-cac.sh → akeneo-apache/files/pim-cac.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 echo "Clean cache folder"
-rm -rf app/cache/prod
-rm -rf app/cache/dev
+rm -rf app/cache/*
 
 app/console ca:c -e=prod
+app/console ca:c -e=test
+app/console ca:c -e=behat
 app/console ca:c

akeneo/files/pim-initialize.sh → akeneo-apache/files/pim-initialize.sh

@@ -2,8 +2,7 @@
 
 echo "Clean the install"
 rm -rf app/archive/*
-rm -rf app/cache/prod
-rm -rf app/cache/dev
+rm -rf app/cache/*
 rm -rf app/file_storage/*
 rm -rf app/logs/*
 rm -rf web/bundles/*
@@ -13,7 +12,10 @@ rm -rf web/media/*
 
 echo "Initialize the PIM"
 app/console ca:c -e=prod
+app/console ca:c -e=behat
 
 app/console -e=prod oro:requirejs:generate-config
 app/console -e=prod pim:install --force
 app/console -e=prod assets:install --symlink
+
+app/console -e=behat pim:installer:db

run_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-images=("php" "fpm" "apache-php" "akeneo" "akeneo-behat" "akeneo-fpm")
-versions=("5.6" "5.6" "php-5.6" "php-5.6" "php-5.6" "php-5.6")
+images=("php" "fpm" "apache-php" "akeneo-apache" "akeneo-fpm")
+versions=("5.6" "5.6" "php-5.6" "php-5.6" "php-5.6")
 
 cwd=$(pwd)
 for (( i=0; i<${#images[@]}; i++ ));