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
c300144f
Commit
c300144f
authored
2 years ago
by
Konstantin Pavlov
Committed by
Konstantin Pavlov
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
modules: use NGINX_FROM_IMAGE to specify which image to start with.
parent
46a0d483
Branches
kegan/3pid-inv
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/Dockerfile
+3
-3
3 additions, 3 deletions
modules/Dockerfile
modules/Dockerfile.alpine
+3
-3
3 additions, 3 deletions
modules/Dockerfile.alpine
with
6 additions
and
6 deletions
modules/Dockerfile
+
3
−
3
View file @
c300144f
ARG
NGINX_
VERSION_FROM=
mainline
FROM
nginx:
${NGINX_
VERSION_FROM
}
as
builder
ARG
NGINX_
FROM_IMAGE=nginx:
mainline
FROM
${NGINX_
FROM_IMAGE
}
as
builder
ARG
ENABLED_MODULES
...
...
@@ -69,7 +69,7 @@ RUN set -ex \
done \
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env
FROM
nginx:
${NGINX_
VERSION_FROM
}
FROM
${NGINX_
FROM_IMAGE
}
COPY
--from=builder /tmp/packages /tmp/packages
RUN
set
-ex
\
&&
apt update
\
...
...
This diff is collapsed.
Click to expand it.
modules/Dockerfile.alpine
+
3
−
3
View file @
c300144f
ARG NGINX_
VERSION_FROM=
mainline-alpine
FROM
nginx:
${NGINX_
VERSION_FROM}-alpine
as builder
ARG NGINX_
FROM_IMAGE=nginx:
mainline-alpine
FROM ${NGINX_
FROM_IMAGE}
as builder
ARG ENABLED_MODULES
...
...
@@ -61,7 +61,7 @@ RUN set -ex \
done \
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env
FROM
nginx:
${NGINX_
VERSION_FROM}-alpine
FROM ${NGINX_
FROM_IMAGE}
COPY --from=builder /tmp/packages /tmp/packages
RUN set -ex \
&& . /tmp/packages/modules.env \
...
...
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