Skip to content

Commit 4fe3ec1

Browse files
committed
Minor changes
1 parent 5e9ace8 commit 4fe3ec1

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

app/images/php-fpm/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
100100

101101
COPY ./root/bash_profile /root/.bash_profile
102102
COPY ./root/ssh/config /root/.ssh/config
103+
COPY ./root/ssh/github.pkey /root/.ssh/github
103104

104105
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
105106
RUN apt-get -y install nodejs

app/images/php-fpm/DockerfileXDebug

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
103103

104104
COPY ./root/bash_profile /root/.bash_profile
105105
COPY ./root/ssh/config /root/.ssh/config
106+
COPY ./root/ssh/github.pkey /root/.ssh/github
106107

107108
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
108109
RUN apt-get -y install nodejs

app/images/php-fpm/root/bash_profile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ xf2-export() {
2929
php cmd.php xf-dev:export --addon=$1
3030
}
3131

32+
xf2-api-docs() {
33+
php cmd.php xf-dev:generate-api-docs --force --renderer=xf2Html --target=src/addons/$1/_no_upload/api.html $1
34+
}
35+
3236
xf2-better-export() {
3337
php cmd.php tck-devtools:better-export $1 --skip-export
3438
php cmd.php tck-devtools:build-readme $1 --markdown --copy

app/images/php-fpm/root/ssh/config

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ Host *
22
AddKeysToAgent yes
33

44
Host github.com
5+
HostName github.com
6+
#Port 443
7+
PreferredAuthentications publickey
8+
AddKeysToAgent yes
9+
IdentityFile /root/.ssh/github
10+
11+
Host ssh.github.com
512
HostName ssh.github.com
6-
Port 443
13+
#Port 443
714
PreferredAuthentications publickey
815
AddKeysToAgent yes
9-
IdentityFile /var/www/git/docker-php-apache/github.pkey
16+
IdentityFile /root/.ssh/github

0 commit comments

Comments
 (0)