瀏覽代碼

Adding node to container and mysql default creds

Herton 6 年之前
父節點
當前提交
0bafea1eb2
共有 3 個文件被更改,包括 18 次插入9 次删除
  1. 12 7
      Dockerfile
  2. 2 2
      docker-compose.yml
  3. 4 0
      mysql/my.cnf

+ 12 - 7
Dockerfile

@@ -26,25 +26,30 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install extensions
 RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl
-RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
-RUN docker-php-ext-install gd
+RUN docker-php-ext-configure mcrypt
+RUN docker-php-ext-install mcrypt
 
 # Install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+# Install NodeJs
+RUN curl -sL https://deb.nodesource.com/setup_11.x | bash -
+RUN apt-get install -y nodejs
+
 # Add user for laravel application
-RUN groupadd -g 1000 www
-RUN useradd -u 1000 -ms /bin/bash -g www www
+RUN groupadd -g 1000 www-data
+RUN useradd -u 1000 -ms /bin/bash -g www-data www-data
 
 # Copy existing application directory contents
 COPY . /var/www
 
 # Copy existing application directory permissions
-COPY --chown=www:www . /var/www
+COPY --chown=www-data:www-data . /var/www
 
-# Change current user to www
-USER www
+# Change current user to www-data
+USER www-data
 
 # Expose port 9000 and start php-fpm server
 EXPOSE 9000
 CMD ["php-fpm"]
+

+ 2 - 2
docker-compose.yml

@@ -15,8 +15,8 @@ services:
       SERVICE_TAGS: dev
     working_dir: /var/www
     volumes:
-       - ./:/var/www
-       - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+      - ./:/var/www
+      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
     networks:
       - app-network
 

+ 4 - 0
mysql/my.cnf

@@ -1,3 +1,7 @@
 [mysqld]
 general_log = 1
 general_log_file = /var/lib/mysql/general.log
+
+[client]
+user=api
+password=mysql_root_password