Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 5ae9bbd

Browse files
one-and-onlyone-and-only
authored
Merge pull request #11 from one-and-only/v0.8
v0.8
2 parents 242ac9e + 6070863 commit 5ae9bbd

File tree

11 files changed

+96
-31
lines changed

11 files changed

+96
-31
lines changed

‎.github/workflows/YAMLLint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: 'YAML Lint'
23
on:
34
- pull_request

‎.github/workflows/shellcheck.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: 'ShellCheck'
23
on:
34
- pull_request
@@ -6,10 +7,11 @@ jobs:
67
runs-on: ubuntu-latest
78
steps:
89
- uses: actions/checkout@v1
9-
- name: Run the sh-checker
10-
uses: luizm/action-sh-checker@v0.1.4
10+
- name: 'Run the ShellCheck'
11+
uses: luizm/action-sh-checker@v0.1.7
1112
env:
1213
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13-
SHELLCHECK_OPTS: -e SC2164 SC2162 SC2016 SC1090 # It is posible to exclude some shellcheck warnings.
14+
SHELLCHECK_OPTS: -e SC2164,SC2162,SC2016,SC1090,SC1017,SC2116
1415
with:
1516
sh_checker_comment: true
17+
sh_checker_shfmt_disable: true

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Install Guide Coming Soon
44

55
# PLEASE NOTE:
6-
### 1. Some PHP extensions may not be installed in all versions of the PHP CLI due to incompatibility or build errors. The PHP extensions that were removed from PHP 8 downwards are the following:
6+
### 1. Some PHP extensions may not be installed in all versions due to incompatibility or build errors. The PHP extensions that were removed from PHP 8 downwards are the following:
77
* latest-7.4: ***enchant***
88
* latest-7.3: ***enchant, iconv, TIDY***
99
* latest-7.2: ***enchant, iconv, TIDY, GD, webp support, jpeg support, freetype, zip read/write support***

debian/Docker/docker-compose.yml renamed to debian/dockerFiles/docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1+
---
12
version: "3.8"
2-
services:
3-
web:
4-
build:
3+
services:
4+
web:
5+
build:
56
context: ./php
67
dockerfile: Dockerfile
78
container_name: php74
89
depends_on:
910
- database
10-
ports:
11+
ports:
1112
- "80:80"
12-
volumes:
13+
volumes:
1314
- "./php:/var/www/html"
14-
database:
15+
database:
1516
command: "--default-authentication-plugin=mysql_native_password"
1617
container_name: mysql8
17-
environment:
18+
environment:
1819
MYSQL_DATABASE: defaultdb
1920
MYSQL_ROOT_PASSWORD: "rootPass"
2021
MYSQL_USER: "dbuser"
2122
MYSQL_PASSWORD: "dbuserpassword"
2223
image: "mysql:8.0.21"
23-
ports:
24+
ports:
2425
- "6033:3306"
2526
restart: always
26-

debian/Docker/php/Dockerfile renamed to debian/dockerFiles/php/Dockerfile

File renamed without changes.

‎debian/install.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#!/bin/bash

‎macos/Docker/dockerDesktop/installDockerDesktop.sh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/bin/bash
2+
SCRIPTDIR=$(pwd)
3+
rm Docker.dmg
4+
wget https://download.docker.com/mac/stable/Docker.dmg || exit
5+
function install() {
6+
cd /Volumes/Docker/
7+
MOUNTEXIST=$?
8+
if [ "$MOUNTEXIST" = 1 ]; then
9+
cd "$SCRIPTDIR"
10+
hdiutil attach Docker.dmg
11+
cd /Volumes/Docker/ || exit
12+
ls Applications/Docker.app
13+
DOCKERINSTALLED=$?
14+
if [ "$DOCKERINSTALLED" = 1 ]; then
15+
echo installing Docker Desktop
16+
cp -r Docker.app/ /Applications || exit
17+
echo Docker Desktop installed successfully
18+
cd ~/
19+
diskutil unmount /Volumes/Docker
20+
exit 0
21+
elif [ "$DOCKERINSTALLED" = 0 ]; then
22+
read -p 'Docker Desktop is already installed. Would you like to remove it?[Yes/default: No] ' UNINSTALLCHOICE
23+
UNINSTALLCHOICE=${UNINSTALLCHOICE:-No}
24+
if [ "$UNINSTALLCHOICE" = Yes ]; then
25+
echo uninstalling Docker Desktop
26+
sudo rm -r Applications/Docker.app
27+
echo uninstalled Docker Desktop
28+
echo installing docker Desktop
29+
cp -r Docker.app Applications/ || exit
30+
echo installed docker desktop
31+
cd ~/
32+
echo unmounting install volume
33+
diskutil unmount /Volumes/Docker
34+
echo unmounted install volume
35+
exit 0
36+
elif [ "$UNINSTALLCHOICE" = No ]; then
37+
echo cancelling installation
38+
exit 130
39+
else
40+
invalid argument, exiting...
41+
exit 1
42+
fi
43+
fi
44+
elif [ "$MOUNTEXIST" = 0 ]; then
45+
cd ~/ || exit
46+
read -p "A version of this image is already mounted. Would you like to automatically unmount this volume?[Yes/default: No] " UNMOUNTCHOICE
47+
UNMOUNTCHOICE=${UNMOUNTCHOICE:-No}
48+
if [ "$UNMOUNTCHOICE" = Yes ]; then
49+
diskutil unmount /Volumes/Docker
50+
install
51+
elif [ "$UNMOUNTCHOICE" = No ]; then
52+
echo cancelling installation
53+
exit 130
54+
else
55+
echo invalid argument, exiting...
56+
exit 1
57+
fi
58+
fi
59+
}
60+
61+
install

macos/Docker/docker-compose.yml renamed to macos/Docker/dockerFiles/docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1+
---
12
version: "3.8"
2-
services:
3-
web:
4-
build:
3+
services:
4+
web:
5+
build:
56
context: ./php
67
dockerfile: Dockerfile
78
container_name: php74
89
depends_on:
910
- database
10-
ports:
11+
ports:
1112
- "80:80"
12-
volumes:
13+
volumes:
1314
- "./php:/var/www/html"
14-
database:
15+
database:
1516
command: "--default-authentication-plugin=mysql_native_password"
1617
container_name: mysql8
17-
environment:
18+
environment:
1819
MYSQL_DATABASE: defaultdb
1920
MYSQL_ROOT_PASSWORD: "rootPass"
2021
MYSQL_USER: "dbuser"
2122
MYSQL_PASSWORD: "dbuserpassword"
2223
image: "mysql:8.0.21"
23-
ports:
24+
ports:
2425
- "6033:3306"
2526
restart: always
26-

macos/Docker/php/Dockerfile renamed to macos/Docker/dockerFiles/php/Dockerfile

File renamed without changes.

windows/Docker/docker-compose.yml renamed to windows/dockerFiles/docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1+
---
12
version: "3.8"
2-
services:
3-
web:
4-
build:
3+
services:
4+
web:
5+
build:
56
context: ./php
67
dockerfile: Dockerfile
78
container_name: php74
89
depends_on:
910
- database
10-
ports:
11+
ports:
1112
- "80:80"
12-
volumes:
13+
volumes:
1314
- "./php:/var/www/html"
14-
database:
15+
database:
1516
command: "--default-authentication-plugin=mysql_native_password"
1617
container_name: mysql8
17-
environment:
18+
environment:
1819
MYSQL_DATABASE: defaultdb
1920
MYSQL_ROOT_PASSWORD: "rootPass"
2021
MYSQL_USER: "dbuser"
2122
MYSQL_PASSWORD: "dbuserpassword"
2223
image: "mysql:8.0.21"
23-
ports:
24+
ports:
2425
- "6033:3306"
2526
restart: always
26-

0 commit comments

Comments
 (0)