mirror of
https://github.com/opensupports/opensupports.git
synced 2025-07-29 08:44:58 +02:00
[DEV-315] Create docker routine for frontend that works on Mac (#1175)
* [DEV-315] Create docker routine for frontend that works on Mac * Add make option to run bash inside container
This commit is contained in:
parent
e190710252
commit
5e7f39df05
11
client/Makefile
Normal file
11
client/Makefile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
build:
|
||||||
|
@docker pull node:11.15.0
|
||||||
|
|
||||||
|
run: stop
|
||||||
|
@docker run --platform=linux/amd64 --network os-net --name opensupports-client -v $(PWD):/client:delegated -p 3000:3000 node:11.15.0 sh -c "cd client && npm install && npm start"
|
||||||
|
|
||||||
|
sh: stop
|
||||||
|
@docker run -it --platform=linux/amd64 --network os-net --name opensupports-client -v $(PWD):/client:delegated -p 3000:3000 node:11.15.0 sh -c "bash"
|
||||||
|
|
||||||
|
stop:
|
||||||
|
@docker rm -f opensupports-client || true
|
24581
client/package-lock.json
generated
24581
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -13,7 +13,7 @@
|
|||||||
"npm": "^2.1.x"
|
"npm": "^2.1.x"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "webpack-dev-server",
|
"start": "webpack-dev-server --display-reasons --display-error-details --history-api-fallback --progress --colors",
|
||||||
"start-fixtures": "webpack-dev-server --env.FIXTURES=1",
|
"start-fixtures": "webpack-dev-server --env.FIXTURES=1",
|
||||||
"build": "./node_modules/.bin/rimraf build && NODE_ENV=production ./node_modules/.bin/webpack -p --devtool none",
|
"build": "./node_modules/.bin/rimraf build && NODE_ENV=production ./node_modules/.bin/webpack -p --devtool none",
|
||||||
"test": "export NODE_PATH=src && mocha src/lib-test/preprocessor.js --require @babel/register --recursive src/**/**/__tests__/*-test.js"
|
"test": "export NODE_PATH=src && mocha src/lib-test/preprocessor.js --require @babel/register --recursive src/**/**/__tests__/*-test.js"
|
||||||
|
@ -24,10 +24,18 @@ const config = env => {
|
|||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
test :/\.js$/,
|
test: /\.js$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
use: ['babel-loader'/*, 'eslint-loader'*/],
|
use: [
|
||||||
},
|
{
|
||||||
|
loader: "babel-loader",
|
||||||
|
options: {
|
||||||
|
cacheDirectory: true,
|
||||||
|
cacheCompression: false,
|
||||||
|
},
|
||||||
|
} /*, 'eslint-loader'*/,
|
||||||
|
],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
test: /\.css$/,
|
test: /\.css$/,
|
||||||
use: [
|
use: [
|
||||||
@ -58,17 +66,19 @@ const config = env => {
|
|||||||
},
|
},
|
||||||
devServer: {
|
devServer: {
|
||||||
contentBase: BUILD_DIR,
|
contentBase: BUILD_DIR,
|
||||||
host: 'localhost',
|
host: "0.0.0.0",
|
||||||
compress: true,
|
compress: true,
|
||||||
port: 3000,
|
port: 3000,
|
||||||
disableHostCheck: false,
|
disableHostCheck: true,
|
||||||
open: true,
|
open: true,
|
||||||
hot: true,
|
hot: true,
|
||||||
historyApiFallback: true,
|
historyApiFallback: true,
|
||||||
proxy: {
|
proxy: {
|
||||||
'/api': {
|
"/api": {
|
||||||
target: 'http://localhost:8080',
|
target: "http://opensupports-srv:80",
|
||||||
pathRewrite: {'^/api' : ''},
|
pathRewrite: { "^/api": "" },
|
||||||
|
secure: false,
|
||||||
|
changeOrigin: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -3,9 +3,9 @@ yellow=`tput setaf 3`
|
|||||||
reset=`tput sgr0`
|
reset=`tput sgr0`
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@docker pull mysql:5.6
|
@docker pull mysql:5.6 || true
|
||||||
@docker pull phpmyadmin/phpmyadmin
|
@docker pull phpmyadmin/phpmyadmin || true
|
||||||
@docker pull munkyboy/fakesmtp
|
@docker pull munkyboy/fakesmtp || true
|
||||||
@docker build -t opensupports-srv . || echo "A${red}An error occurred${reset}"
|
@docker build -t opensupports-srv . || echo "A${red}An error occurred${reset}"
|
||||||
@docker network create os-net || true
|
@docker network create os-net || true
|
||||||
|
|
||||||
@ -14,10 +14,10 @@ install:
|
|||||||
@docker exec -it opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
|
@docker exec -it opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
|
||||||
|
|
||||||
run: stop
|
run: stop
|
||||||
@docker run -d --network os-net --name opensupports-db -p 4040:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -v $(PWD)/.dbdata/:/var/lib/mysql mysql:5.6
|
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-db -p 4040:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -v $(PWD)/.dbdata/:/var/lib/mysql mysql:5.6
|
||||||
@docker run -d --network os-net --name opensupports-myadmin --link opensupports-db:db -p 6060:80 phpmyadmin/phpmyadmin
|
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-myadmin --link opensupports-db:db -p 6060:80 phpmyadmin/phpmyadmin
|
||||||
@docker run -d --network os-net --name opensupports-fakesmtp -p 7070:25 -v ${PWD}/.fakemail/:/var/mail munkyboy/fakesmtp
|
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-fakesmtp -p 7070:25 -v ${PWD}/.fakemail/:/var/mail munkyboy/fakesmtp
|
||||||
@docker run -d --network os-net --name opensupports-srv -p 8080:80 --link opensupports-db:mysql --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
|
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-srv -p 8080:80 --link opensupports-db:mysql --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@docker exec -it opensupports-srv bash -c "cd /var/www/html && ./run-tests.sh"
|
@docker exec -it opensupports-srv bash -c "cd /var/www/html && ./run-tests.sh"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user