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
483f2828
Commit
483f2828
authored
3 months ago
by
Reuben Lifshay
Committed by
A compound of Fe and O
3 months ago
Browse files
Options
Downloads
Patches
Plain Diff
chore: use gettext-envsubst alpine package instead of workaround
parent
0aa20e60
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile-alpine-slim.template
+2
-17
2 additions, 17 deletions
Dockerfile-alpine-slim.template
with
2 additions
and
17 deletions
Dockerfile-alpine-slim.template
+
2
−
17
View file @
483f2828
...
...
@@ -77,23 +77,8 @@ RUN set -x \
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
# Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext`
# then move `envsubst` out of the way so `gettext` can
# be deleted completely, then move `envsubst` back.
&& apk add --no-cache --virtual .gettext gettext \
&& mv /usr/bin/envsubst /tmp/ \
\
&& runDeps="$( \
scanelf --needed --nobanner /tmp/envsubst \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \
)" \
&& apk add --no-cache $runDeps \
&& apk del --no-network .gettext \
&& mv /tmp/envsubst /usr/local/bin/ \
# Add `envsubst` for templating environment variables
&& apk add --no-cache gettext-envsubst \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
...
...
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