Skip to content

Commit 0bbb0fc

Browse files
committed
merge code
2 parents 0e69aa0 + 31fa355 commit 0bbb0fc

File tree

4 files changed

+23
-29
lines changed

4 files changed

+23
-29
lines changed
Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
# x86_64 运行 arm64
1+
# `x86_64` 平台模拟 `arm64`
22

3-
> 使用 qemu-user-static 实现
3+
使用 `qemu-user-static` 实现
44

55
## 参考文档
66

7-
qemu
8-
https://www.qemu.org/
9-
https://github.com/qemu/qemu.git
10-
11-
qemu-user-static
12-
https://github.com/multiarch/qemu-user-static.git
13-
14-
x86 平台利用 qemu-user-static 实现 arm64 平台 docker 镜像的运行和构建
15-
https://www.cnblogs.com/chen2ha/p/17180287.html
16-
17-
Docker在x86架构的物理机上跑Qemu-arm 容器
18-
https://blog.csdn.net/sunSHINEEzy/article/details/80015638
7+
- [qemu 官网](https://www.qemu.org/)
8+
- [qemu GitHub](https://github.com/qemu/qemu.git)
9+
- [qemu-user-static](https://github.com/multiarch/qemu-user-static.git)
10+
- [x86 平台利用 qemu-user-static 实现 arm64 平台 docker 镜像的运行和构建](https://www.cnblogs.com/chen2ha/p/17180287.html)
11+
- [Docker在x86架构的物理机上跑Qemu-arm 容器](https://blog.csdn.net/sunSHINEEzy/article/details/80015638)
1912

2013

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
# 当环境中没有 PHP 解释器时 可以快速安装 PHP 解释器
1+
# 常见问题
22

3-
```bash
3+
## 快速安装 `PHP` 解释器
44

5-
# alpine
5+
### Alpine
66

7-
sh sapi/quickstart/linux/extra/alpine-php-init.sh
7+
```bash
8+
sh sapi/quickstart/linux/extra/alpine-php-init.sh
9+
```
810

9-
## debian
11+
### Debian/Ubuntu
1012

13+
```bash
1114
bash sapi/quickstart/linux/extra/debian-php-init.sh
12-
1315
```
1416

15-
## download composer
17+
## 安装 `Composer`
1618

1719
```bash
1820
curl -Lo /usr/local/bin/composer.phar https://getcomposer.org/download/latest-stable/composer.phar
@@ -22,8 +24,8 @@ chmod a+x /usr/local/bin/composer
2224

2325
```
2426

25-
## c c++编译器 组合
27+
## `C/C++` 编译器组合
2628

27-
- 组合一 clang clang++
28-
- 组合二 gcc g++
29+
- `clang` + `clang++`
30+
- `gcc` + `g++`
2931

sapi/quickstart/linux/install-docker.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ esac
4242

4343
if [ -n "$http_proxy" ] || [ -n "$https_proxy" ] || [ -n "$HTTP_PROXY" ] || [ -n "$HTTPS_PROXY" ]; then
4444
set +u
45-
uset http_proxy
46-
uset https_proxy
47-
uset HTTP_PROXY
48-
uset HTTPS_PROXY
45+
unset http_proxy
46+
unset https_proxy
47+
unset HTTP_PROXY
48+
unset HTTPS_PROXY
4949
set -u
5050
fi
5151

sapi/src/template/make.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env bash
21
<?php
32
/**
43
* @var $this SwooleCli\Preprocessor

0 commit comments

Comments
 (0)