Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-nginx
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
nginxinc
docker-nginx
Commits
829c3fbe
Commit
829c3fbe
authored
10 months ago
by
Konstantin Pavlov
Committed by
Konstantin Pavlov
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
modules: pkg-oss moved to GitHub.
parent
f0fc31f0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/Dockerfile
+3
-3
3 additions, 3 deletions
modules/Dockerfile
modules/Dockerfile.alpine
+1
-1
1 addition, 1 deletion
modules/Dockerfile.alpine
modules/README.md
+2
-2
2 additions, 2 deletions
modules/README.md
with
6 additions
and
6 deletions
modules/Dockerfile
+
3
−
3
View file @
829c3fbe
...
...
@@ -14,11 +14,11 @@ COPY ./ /modules/
RUN
apt-get update
\
&&
apt-get
install
-y
--no-install-suggests
--no-install-recommends
\
patch make wget
mercurial
devscripts debhelper dpkg-dev
\
patch make wget
git
devscripts debhelper dpkg-dev
\
quilt lsb-release build-essential libxml2-utils xsltproc
\
equivs git g++ libparse-recdescent-perl
\
&&
XSLSCRIPT_SHA512
=
"f7194c5198daeab9b3b0c3aebf006922c7df1d345d454bd8474489ff2eb6b4bf8e2ffe442489a45d1aab80da6ecebe0097759a1e12cc26b5f0613d05b7c09ffa *stdin"
\
&&
wget
-O
/tmp/xslscript.pl https://
hg.nginx.org/xslscript/raw-file/01dc9ba12e1b
/xslscript.pl
\
&&
wget
-O
/tmp/xslscript.pl https://
raw.githubusercontent.com/nginx/xslscript/9204424259c343ca08a18a78915f40f28025e093
/xslscript.pl
\
&&
if
[
"
$(
cat
/tmp/xslscript.pl | openssl sha512
-r
)
"
=
"
$XSLSCRIPT_SHA512
"
]
;
then
\
echo
"XSLScript checksum verification succeeded!"
;
\
chmod
+x /tmp/xslscript.pl
;
\
...
...
@@ -27,7 +27,7 @@ RUN apt-get update \
echo
"XSLScript checksum verification failed!"
;
\
exit
1
;
\
fi
\
&&
h
g clone
-
r
${
NGINX_VERSION
}
-
${
PKG_RELEASE
%%~*
}
https://
hg.
nginx
.org
/pkg-oss/
\
&&
g
it
clone
-
b
${
NGINX_VERSION
}
-
${
PKG_RELEASE
%%~*
}
https://
github.com/
nginx/pkg-oss/
\
&&
cd
pkg-oss
\
&&
mkdir
/tmp/packages
\
&&
for
module
in
$ENABLED_MODULES
;
do
\
...
...
This diff is collapsed.
Click to expand it.
modules/Dockerfile.alpine
+
1
−
1
View file @
829c3fbe
...
...
@@ -19,7 +19,7 @@ RUN apk update \
# allow abuild as a root user \
&& printf "#!/bin/sh\\nSETFATTR=true /usr/bin/abuild -F \"\$@\"\\n" > /usr/local/bin/abuild \
&& chmod +x /usr/local/bin/abuild \
&&
h
g clone -
r
${NGINX_VERSION}-${PKG_RELEASE} https://
hg.
nginx
.org
/pkg-oss/ \
&& g
it
clone -
b
${NGINX_VERSION}-${PKG_RELEASE} https://
github.com/
nginx/pkg-oss/ \
&& cd pkg-oss \
&& mkdir /tmp/packages \
&& for module in $ENABLED_MODULES; do \
...
...
This diff is collapsed.
Click to expand it.
modules/README.md
+
2
−
2
View file @
829c3fbe
...
...
@@ -3,7 +3,7 @@
It's possible to extend a mainline image with third-party modules either from
your own instuctions following a simple filesystem layout/syntax using
`build_module.sh`
helper script, or falling back to package sources from
[
pkg-oss
](
https://
hg.
nginx
.org
/pkg-oss
)
.
[
pkg-oss
](
https://
github.com/
nginx/pkg-oss
)
.
## Requirements
...
...
@@ -101,7 +101,7 @@ reproduce with a vanilla image first.
### docker-compose with pre-packaged modules
If desired modules are already packaged in
[
pkg-oss
](
https://
hg.
nginx
.org
/pkg-oss/
)
- e.g.
`debian/Makefile.module-*`
[
pkg-oss
](
https://
github.com/
nginx/pkg-oss/
)
- e.g.
`debian/Makefile.module-*`
exists for a given module, you can use this example.
1.
Create a directory for your project:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment