Commit 45ea3f19 authored by Ricardo Amaro's avatar Ricardo Amaro
Browse files

fixed composer and other problems

parent 967ebbf8
......@@ -25,15 +25,10 @@ ENV NOTVISIBLE "in users profile"
RUN echo "export VISIBLE=now" >> /etc/profile; \
rm -rf /var/lib/mysql/*; /usr/sbin/mysqld --initialize-insecure; \
sed -i 's/^bind-address/#bind-address/g' /etc/mysql/mysql.conf.d/mysqld.cnf; \
sed -i "s/^bind-address/#bind-address/" /etc/mysql/my.cnf
sed -i "s/Basic Settings/Basic Settings\ndefault-authentication-plugin=mysql_native_password\n/" /etc/mysql/mysql.conf.d/mysqld.cnf
# Install Composer, drush and drupal console
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& HOME=/ /usr/local/bin/composer global require drush/drush:~10 \
&& ln -s /.composer/vendor/drush/drush/drush /usr/local/bin/drush \
&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
&& chmod +x /usr/local/bin/drupal \
&& php --version; composer --version; drupal --version; drush --version
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# Install supervisor
COPY ./files/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
......@@ -43,17 +38,17 @@ COPY ./files/foreground.sh /etc/apache2/foreground.sh
# Apache & Xdebug
RUN rm /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/*
ADD ./files/000-default.conf /etc/apache2/sites-available/000-default.conf
ADD ./files/xdebug.ini /etc/php/7.2/mods-available/xdebug.ini
ADD ./files/xdebug.ini /etc/php/7.3/mods-available/xdebug.ini
RUN a2ensite 000-default ; a2enmod rewrite vhost_alias
# Drupal new version, clean cache
ADD https://updates.drupal.org/release-history/drupal/${DRUPALVER} /tmp/latest.xml
RUN echo "DRUPAL: ${DRUPALVER}"
# Retrieve drupal & adminer
RUN cd /var/www/html; git clone --depth 1 --single-branch -b ${DRUPALVER} \
https://git.drupalcode.org/project/drupal.git web && cd web; composer install \
RUN cd /var/www/html; \
git clone --depth 1 --single-branch -b ${DRUPALVER} https://git.drupalcode.org/project/drupal.git web \
&& cd web; composer require drush/drush:~10; composer install \
&& php --version; composer --version; vendor/bin/drush --version; vendor/bin/drush status \
&& cd /var/www/html; chmod a+w web/sites/default; \
mkdir web/sites/default/files; chown -R www-data:www-data /var/www/html/; \
chmod -R ug+w /var/www/html/ ; \
......
......@@ -3,10 +3,10 @@
export BASEHTML="/var/www/html"
export DOCROOT="/var/www/html/web"
export GRPID=$(stat -c "%g" /var/lib/mysql/)
export DRUSH="/.composer/vendor/drush/drush/drush"
export DRUSH="${DOCROOT}/vendor/bin/drush"
export LOCAL_IP=$(hostname -I| awk '{print $1}')
export HOSTIP=$(/sbin/ip route | awk '/default/ { print $3 }')
export DRUPALVER=9
export DRUPALVER=9.0.x
echo "${HOSTIP} dockerhost" >> /etc/hosts
echo "Started Container: $(date)"
......@@ -28,7 +28,7 @@ if [ ! -f ${DOCROOT}/index.php ]; then
# ${DRUSH} -vy dl drupal --default-major=${DRUPALVER} --drupal-project-rename="web"
git clone --depth 1 --single-branch -b ${DRUPALVER} \
https://git.drupalcode.org/project/drupal.git web;
cd web; composer install
cd web; composer require drush/drush:~10 drupal/console; composer install
chmod a+w ${DOCROOT}/sites/default;
mkdir ${DOCROOT}/sites/default/files;
wget "http://www.adminer.org/latest.php" -O ${DOCROOT}/adminer.php
......@@ -49,16 +49,16 @@ if ( ! grep -q 'database.*=>.*drupal' ${DOCROOT}/sites/default/settings.php 2>/d
echo ${DRUPAL_PASSWORD} > /var/lib/mysql/mysql/drupal-db-pw.txt
# Wait for mysql
echo -n "Waiting for mysql "
while ! mysqladmin status >/dev/null 2>&1;
do echo -n . ; sleep 1;
while ! mysqladmin status >/dev/null 2>&1; do
echo -n . ; sleep 1;
done;
echo;
# Create and change MySQL creds
mysqladmin -u root password ${ROOT_PASSWORD} 2>/dev/null
mysql -uroot -p${ROOT_PASSWORD} -e \
"GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '$DEBPASS';" 2>/dev/null
"GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED WITH mysql_native_password BY '$DEBPASS';" 2>/dev/null
mysql -uroot -p${ROOT_PASSWORD} -e \
"CREATE DATABASE drupal; GRANT ALL PRIVILEGES ON drupal.* TO 'drupal'@'%' IDENTIFIED BY '$DRUPAL_PASSWORD'; FLUSH PRIVILEGES;" 2>/dev/null
"CREATE DATABASE drupal; GRANT ALL PRIVILEGES ON drupal.* TO 'drupal'@'%' IDENTIFIED WITH mysql_native_password BY '$DRUPAL_PASSWORD'; FLUSH PRIVILEGES;" 2>/dev/null
cd ${DOCROOT}
cp sites/default/default.settings.php sites/default/settings.php
${DRUSH} site-install standard -y --account-name=admin --account-pass=admin \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment