Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
3241fd4a
Commit
3241fd4a
authored
4 years ago
by
m.nabokikh
Browse files
Options
Downloads
Patches
Plain Diff
Move downloading gomplate to separate stage
Signed-off-by:
m.nabokikh
<
maksim.nabokikh@flant.com
>
parent
a6cb6277
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+12
-8
12 additions, 8 deletions
Dockerfile
docker-entrypoint.sh
+0
-1
0 additions, 1 deletion
docker-entrypoint.sh
with
12 additions
and
9 deletions
Dockerfile
+
12
−
8
View file @
3241fd4a
...
@@ -20,14 +20,7 @@ COPY . .
...
@@ -20,14 +20,7 @@ COPY . .
RUN
make release-binary
RUN
make release-binary
FROM
alpine:3.13.1
FROM
alpine:3.13.1
AS
gomplate
# Dex connectors, such as GitHub and Google logins require root certificates.
# Proper installations should manage those certificates, but it's a bad user
# experience when this doesn't work out of the box.
#
# OpenSSL is required so wget can query HTTPS endpoints for health checking.
RUN
apk add
--no-cache
--update
ca-certificates openssl
ARG
TARGETOS
ARG
TARGETOS
ARG
TARGETARCH
ARG
TARGETARCH
...
@@ -38,6 +31,16 @@ RUN wget -O /usr/local/bin/gomplate \
...
@@ -38,6 +31,16 @@ RUN wget -O /usr/local/bin/gomplate \
"https://github.com/hairyhenderson/gomplate/releases/download/
${
GOMPLATE_VERSION
}
/gomplate_
${
TARGETOS
:-
linux
}
-
${
TARGETARCH
:-
amd64
}${
TARGETVARIANT
}
"
\
"https://github.com/hairyhenderson/gomplate/releases/download/
${
GOMPLATE_VERSION
}
/gomplate_
${
TARGETOS
:-
linux
}
-
${
TARGETARCH
:-
amd64
}${
TARGETVARIANT
}
"
\
&&
chmod
+x /usr/local/bin/gomplate
&&
chmod
+x /usr/local/bin/gomplate
FROM
alpine:3.13.1
# Dex connectors, such as GitHub and Google logins require root certificates.
# Proper installations should manage those certificates, but it's a bad user
# experience when this doesn't work out of the box.
#
# OpenSSL is required so wget can query HTTPS endpoints for health checking.
RUN
apk add
--no-cache
--update
ca-certificates openssl
RUN
mkdir
-p
/var/dex
RUN
mkdir
-p
/var/dex
RUN
chown
-R
1001:1001 /var/dex
RUN
chown
-R
1001:1001 /var/dex
...
@@ -50,6 +53,7 @@ COPY --from=builder /usr/local/src/dex/go.mod /usr/local/src/dex/go.sum /usr/loc
...
@@ -50,6 +53,7 @@ COPY --from=builder /usr/local/src/dex/go.mod /usr/local/src/dex/go.sum /usr/loc
COPY
--from=builder /usr/local/src/dex/api/v2/go.mod /usr/local/src/dex/api/v2/go.sum /usr/local/src/dex/api/v2/
COPY
--from=builder /usr/local/src/dex/api/v2/go.mod /usr/local/src/dex/api/v2/go.sum /usr/local/src/dex/api/v2/
COPY
--from=builder /go/bin/dex /usr/local/bin/dex
COPY
--from=builder /go/bin/dex /usr/local/bin/dex
COPY
--from=gomplate /usr/local/bin/gomplate /usr/local/bin/gomplate
USER
1001:1001
USER
1001:1001
...
...
This diff is collapsed.
Click to expand it.
docker-entrypoint.sh
+
0
−
1
View file @
3241fd4a
...
@@ -9,7 +9,6 @@ case "$command" in
...
@@ -9,7 +9,6 @@ case "$command" in
if
test
-f
"
$file_candidate
"
;
then
if
test
-f
"
$file_candidate
"
;
then
tmpfile
=
$(
mktemp
/tmp/dex.config.yaml-XXXXXX
)
tmpfile
=
$(
mktemp
/tmp/dex.config.yaml-XXXXXX
)
gomplate
-f
"
$file_candidate
"
-o
"
$tmpfile
"
gomplate
-f
"
$file_candidate
"
-o
"
$tmpfile
"
echo
"config rendered successfully into the tmp file
${
tmpfile
}
"
args
=
"
${
args
}
${
tmpfile
}
"
args
=
"
${
args
}
${
tmpfile
}
"
else
else
...
...
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