siamon123 · junedkhatri31 · Sep 16, 2020 · Sep 16, 2020
diff --git a/000-default.conf b/000-default.conf
@@ -0,0 +1,10 @@
+<VirtualHost *:80>
+  ServerAdmin webmaster@localhost
+  DocumentRoot /var/www
+
+  <Directory /var/www>
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    Require all granted
+  </Directory>
+</VirtualHost>
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:7-apache
+
+
+RUN docker-php-ext-install mysqli 
+
+COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
+
+COPY start-apache /usr/local/bin
+RUN chmod +x /usr/local/bin/start-apache
+
+RUN a2enmod rewrite
+
+COPY src /var/www/
+RUN chown -R www-data:www-data /var/www
+
+CMD ["start-apache"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3'
+services:
+    web:
+        # docker image build -t warehouse .
+        image: warehouse
+        ports:
+        - "8000:80"
+    db:
+        image: mysql:5.6
+        environment: 
+            MYSQL_USER: admin
+            MYSQL_PASSWORD: root
+            MYSQL_DATABASE: oswa_inv
+            MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
diff --git a/init_db.sh b/init_db.sh
@@ -0,0 +1 @@
+docker-compose exec -T db mysql oswa_inv < migrations/oswa_inv.sql
diff --git a/oswa_inv.sql → migrations/oswa_inv.sql b/oswa_inv.sql → migrations/oswa_inv.sql
diff --git a/add_group.php → src/add_group.php b/add_group.php → src/add_group.php
diff --git a/add_product.php → src/add_product.php b/add_product.php → src/add_product.php
diff --git a/add_sale.php → src/add_sale.php b/add_sale.php → src/add_sale.php
diff --git a/add_user.php → src/add_user.php b/add_user.php → src/add_user.php
diff --git a/admin.php → src/admin.php b/admin.php → src/admin.php
diff --git a/ajax.php → src/ajax.php b/ajax.php → src/ajax.php
diff --git a/auth.php → src/auth.php b/auth.php → src/auth.php
diff --git a/auth_v2.php → src/auth_v2.php b/auth_v2.php → src/auth_v2.php
diff --git a/categorie.php → src/categorie.php b/categorie.php → src/categorie.php
diff --git a/change_password.php → src/change_password.php b/change_password.php → src/change_password.php
diff --git a/daily_sales.php → src/daily_sales.php b/daily_sales.php → src/daily_sales.php
diff --git a/delete_categorie.php → src/delete_categorie.php b/delete_categorie.php → src/delete_categorie.php
diff --git a/delete_group.php → src/delete_group.php b/delete_group.php → src/delete_group.php
diff --git a/delete_media.php → src/delete_media.php b/delete_media.php → src/delete_media.php
diff --git a/delete_product.php → src/delete_product.php b/delete_product.php → src/delete_product.php
diff --git a/delete_sale.php → src/delete_sale.php b/delete_sale.php → src/delete_sale.php
diff --git a/delete_user.php → src/delete_user.php b/delete_user.php → src/delete_user.php
diff --git a/edit_account.php → src/edit_account.php b/edit_account.php → src/edit_account.php
diff --git a/edit_categorie.php → src/edit_categorie.php b/edit_categorie.php → src/edit_categorie.php
diff --git a/edit_group.php → src/edit_group.php b/edit_group.php → src/edit_group.php
diff --git a/edit_product.php → src/edit_product.php b/edit_product.php → src/edit_product.php
diff --git a/edit_sale.php → src/edit_sale.php b/edit_sale.php → src/edit_sale.php
diff --git a/edit_user.php → src/edit_user.php b/edit_user.php → src/edit_user.php
diff --git a/group.php → src/group.php b/group.php → src/group.php
diff --git a/home.php → src/home.php b/home.php → src/home.php
diff --git a/includes/.DS_Store → src/includes/.DS_Store b/includes/.DS_Store → src/includes/.DS_Store
diff --git a/includes/config.php → src/includes/config.php b/includes/config.php → src/includes/config.php
@@ -12,7 +12,7 @@
 |
 |
 */
-  define( 'DB_HOST', 'localhost' );          // Set database host
+  define( 'DB_HOST', 'db' );          // Set database host
   define( 'DB_USER', 'admin' );             // Set database user
   define( 'DB_PASS', 'root' );             // Set database password
   define( 'DB_NAME', 'oswa_inv' );        // Set database name

diff --git a/includes/database.php → src/includes/database.php b/includes/database.php → src/includes/database.php
diff --git a/includes/functions.php → src/includes/functions.php b/includes/functions.php → src/includes/functions.php
diff --git a/includes/load.php → src/includes/load.php b/includes/load.php → src/includes/load.php
@@ -1,4 +1,3 @@
-
 <?php
 // -----------------------------------------------------------------------
 // DEFINE SEPERATOR ALIASES

diff --git a/includes/session.php → src/includes/session.php b/includes/session.php → src/includes/session.php
diff --git a/includes/sql.php → src/includes/sql.php b/includes/sql.php → src/includes/sql.php
diff --git a/includes/upload.php → src/includes/upload.php b/includes/upload.php → src/includes/upload.php
diff --git a/index.php → src/index.php b/index.php → src/index.php
diff --git a/layouts/.DS_Store → src/layouts/.DS_Store b/layouts/.DS_Store → src/layouts/.DS_Store
diff --git a/layouts/admin_menu.php → src/layouts/admin_menu.php b/layouts/admin_menu.php → src/layouts/admin_menu.php
diff --git a/layouts/footer.php → src/layouts/footer.php b/layouts/footer.php → src/layouts/footer.php
diff --git a/layouts/header.php → src/layouts/header.php b/layouts/header.php → src/layouts/header.php
diff --git a/layouts/special_menu.php → src/layouts/special_menu.php b/layouts/special_menu.php → src/layouts/special_menu.php
diff --git a/layouts/user_menu.php → src/layouts/user_menu.php b/layouts/user_menu.php → src/layouts/user_menu.php
diff --git a/libs/.DS_Store → src/libs/.DS_Store b/libs/.DS_Store → src/libs/.DS_Store
diff --git a/libs/css/main.css → src/libs/css/main.css b/libs/css/main.css → src/libs/css/main.css
diff --git a/libs/images/.DS_Store → src/libs/images/.DS_Store b/libs/images/.DS_Store → src/libs/images/.DS_Store
diff --git a/libs/js/functions.js → src/libs/js/functions.js b/libs/js/functions.js → src/libs/js/functions.js
diff --git a/login_v2.php → src/login_v2.php b/login_v2.php → src/login_v2.php
diff --git a/logout.php → src/logout.php b/logout.php → src/logout.php
diff --git a/media.php → src/media.php b/media.php → src/media.php
diff --git a/monthly_sales.php → src/monthly_sales.php b/monthly_sales.php → src/monthly_sales.php
diff --git a/product.php → src/product.php b/product.php → src/product.php
diff --git a/profile.php → src/profile.php b/profile.php → src/profile.php
diff --git a/sale_report_process.php → src/sale_report_process.php b/sale_report_process.php → src/sale_report_process.php
diff --git a/sales.php → src/sales.php b/sales.php → src/sales.php
diff --git a/sales_report.php → src/sales_report.php b/sales_report.php → src/sales_report.php
diff --git a/uploads/.DS_Store → src/uploads/.DS_Store b/uploads/.DS_Store → src/uploads/.DS_Store
diff --git a/uploads/products/.DS_Store → src/uploads/products/.DS_Store b/uploads/products/.DS_Store → src/uploads/products/.DS_Store
diff --git a/uploads/products/no_image.jpg → src/uploads/products/no_image.jpg b/uploads/products/no_image.jpg → src/uploads/products/no_image.jpg
diff --git a/uploads/users/.DS_Store → src/uploads/users/.DS_Store b/uploads/users/.DS_Store → src/uploads/users/.DS_Store
diff --git a/uploads/users/no_image.jpg → src/uploads/users/no_image.jpg b/uploads/users/no_image.jpg → src/uploads/users/no_image.jpg
diff --git a/users.php → src/users.php b/users.php → src/users.php
diff --git a/start-apache b/start-apache
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+sed -i "s/Listen 80/Listen ${PORT:-80}/g" /etc/apache2/ports.conf
+sed -i "s/:80/:${PORT:-80}/g" /etc/apache2/sites-enabled/*
+apache2-foreground
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker-compose exec -T db mysql oswa_inv < migrations/oswa_inv.sql