Skip to content

Commit 00cc1a4

Browse files
author
Jack Kuan
committed
Fix missing nodejs dependency in the Dockerfile.
Details: - It appears that the nodejs package no longer exists for the base image used by the Dockerfile, and since it's already using the `n` script to install the latest stable version of nodejs, I simply use `n` to install nodejs in the first place instead. - Also fixed a small code formatting issue in packages.pod6. - Corrected the instructions on running the built docker image in CONTRIBUTING.md.
1 parent 9120db3 commit 00cc1a4

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,11 @@ documentation.
273273
You can skip all the above and just build and view documentation with these simple commands (if you have docker already installed):
274274

275275
$ docker build -t perl6-doc .
276-
$ docker run -p 3000:3000 -it -v `pwd`:/doc perl6-doc
276+
$ docker run -p 3000:3000 -it -v `pwd`:/perl6/doc perl6-doc
277277

278278
This will build the documentation for you by default and it will take some time, but for subsequent use you may want to skip build part if nothing has been changed:
279279

280-
$ docker run -p 3000:3000 -it -v `pwd`:/doc perl6-doc bash -c "perl app.pl daemon"
280+
$ docker run -p 3000:3000 -it -v `pwd`:/perl6/doc perl6-doc ./app-start
281281

282282
Now point your web browser to http://localhost:3000 to view the documentation.
283283

Dockerfile

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
FROM rakudo-star:latest
22

3-
RUN buildDeps=' \
3+
RUN buildDeps=' \
44
build-essential \
5-
cpanminus \
6-
npm \
7-
' \
5+
cpanminus \
6+
' \
87
runtimeDeps=' \
9-
graphviz \
10-
make \
11-
nodejs \
8+
graphviz \
9+
make \
1210
ruby-sass \
13-
' \
11+
' \
1412
testDeps=' \
1513
aspell \
1614
' \
17-
15+
\
1816
&& set -x \
17+
\
1918
&& apt-get update \
2019
&& apt-get --yes --no-install-recommends install $buildDeps $runtimeDeps $testDeps \
2120
&& rm -rf /var/lib/apt/lists/* \
22-
23-
&& cpanm -vn Mojolicious \
21+
\
22+
&& cpanm -vn Mojolicious \
2423
&& zef install Test::META \
25-
26-
&& ln -s /usr/bin/nodejs /usr/bin/node \
27-
&& npm cache clean -f \
28-
&& npm install -g n \
29-
&& n stable \
30-
24+
\
25+
&& n=/usr/local/bin/n \
26+
&& curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n > "$n" \
27+
&& chmod +x "$n" \
28+
&& n stable \
29+
\
3130
&& apt-get purge --yes --auto-remove $buildDeps
3231

33-
WORKDIR /perl6/doc/
32+
WORKDIR /perl6/doc
3433
EXPOSE 3000
3534

36-
CMD bash -c 'make test && make html && ./app-start'
35+
CMD make test && make html && ./app-start

doc/Language/packages.pod6

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with a longer name to disambiguate.
2222
A I<name> is anything that is a legal part of a variable name (not counting the
2323
sigil). This includes:
2424
25-
=for code
25+
=begin code
2626
class Foo {
2727
sub zape () { say "zipi" }
2828
class Bar {
@@ -39,6 +39,7 @@ my $bar = 'Bar';
3939
say $Foo::($bar)::quux; # compound identifiers with interpolations; OUTPUT: «42␤»
4040
$42; # numeric names
4141
$!; # certain punctuation variables
42+
=end code
4243
4344
X<|::,package>
4445
C<::> is used to separate nested package names.

0 commit comments

Comments
 (0)