Skip to content

Commit

Permalink
chore: Update version
Browse files Browse the repository at this point in the history
Updated MySQL, GO.
  • Loading branch information
andreipa committed Dec 9, 2020
1 parent eda82cc commit 0248c42
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
data/mysql
logs/apache2
logs/mysql
www
logs/mysql
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ A very basic LAMP stack environment for development. It was built using Docker C

* [PHP 7.4](https://hub.docker.com/_/php)
* [Apache 2.4](https://hub.docker.com/_/httpd)
* [MySQL 8.0](https://hub.docker.com/_/mysql)
* [MySQL 8.0.22](https://hub.docker.com/_/mysql)
* [MailHog 1.0.0](https://github.com/mailhog/MailHog)

## Getting Started
Expand Down Expand Up @@ -93,10 +93,13 @@ By default following extensions are installed.
* curl
* exif
* gettext
* intl
* json
* imagick-3.4.4
* mysqli
* pdo_sqlite
* xdebug-2.9.3
* xdebug-3.0.1
* xml
* zip

> If you want to install more extension, just update `./bin/webserver/Dockerfile`.
Expand Down
2 changes: 1 addition & 1 deletion bin/mysql/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mysql:8.0.19
FROM mysql:8.0.22

# Update and upgrade the system
RUN apt-get update && apt-get upgrade -y --no-install-recommends apt-utils
Expand Down
9 changes: 7 additions & 2 deletions bin/webserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ RUN apt-get update && apt-get install -y \
curl \
git \
libcurl4 \
libonig-dev \
libsqlite3-dev \
libzip-dev \
nano \
unzip \
vim \
zlib1g-dev\
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -25,7 +27,7 @@ RUN mkdir -p /usr/local/etc/php/extra/ \
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

# Configure MailHog
RUN curl -Lsf 'https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz' | tar -C '/usr/local' -xvzf -
RUN curl -Lsf 'https://storage.googleapis.com/golang/go1.15.6.linux-amd64.tar.gz' | tar -C '/usr/local' -xvzf -
ENV PATH /usr/local/go/bin:$PATH
RUN go get github.com/mailhog/mhsendmail
RUN cp /root/go/bin/mhsendmail /usr/bin/mhsendmail
Expand All @@ -36,7 +38,7 @@ RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
# PECL Extensions xdebug | imagick
RUN apt-get update && apt-get install -y \
libmagickwand-dev --no-install-recommends \
&& pecl install xdebug-2.9.3 \
&& pecl install xdebug-3.0.1 \
&& pecl install imagick-3.4.4 \
&& docker-php-ext-enable xdebug imagick

Expand All @@ -46,8 +48,11 @@ RUN apt-get update && apt-get install -y \
&& docker-php-ext-install calendar \
&& docker-php-ext-install exif \
&& docker-php-ext-install gettext \
&& docker-php-ext-install intl \
&& docker-php-ext-install json \
&& docker-php-ext-install mysqli \
&& docker-php-ext-install pdo_mysql \
&& docker-php-ext-install xml \
&& docker-php-ext-install zip

# Enable apache modules
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.9"

services:
webserver:
Expand All @@ -15,10 +15,10 @@ services:
networks:
- dev-lamp-net
volumes:
- ${DOCUMENT_ROOT-./www}:/var/www/html
- ${PHP_INI-./config/php/php.ini}:/usr/local/etc/php/php.ini
- ${VHOSTS_DIR-./config/vhosts}:/etc/apache2/sites-enabled
- ${APACHE_LOG_DIR-./logs/apache2}:/var/log/apache2
- ${DOCUMENT_ROOT}:/var/www/html
- ${PHP_INI}:/usr/local/etc/php/php.ini
- ${VHOSTS_DIR}:/etc/apache2/sites-enabled
- ${APACHE_LOG_DIR}:/var/log/apache2
mysql:
build: ./bin/mysql
container_name: 'dev-8.0.x-mysql'
Expand All @@ -29,8 +29,8 @@ services:
networks:
- dev-lamp-net
volumes:
- ${MYSQL_DATA_DIR-./data/mysql}:/var/lib/mysql
- ${MYSQL_LOG_DIR-./logs/mysql}:/var/log/mysql
- ${MYSQL_DATA_DIR}:/var/lib/mysql
- ${MYSQL_LOG_DIR}:/var/log/mysql
environment:
- MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
- MYSQL_USER=${DB_USER}
Expand Down
2 changes: 2 additions & 0 deletions www/app1/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
phpinfo();

0 comments on commit 0248c42

Please sign in to comment.