Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Docker image. #2473

Merged
merged 2 commits into from
Jan 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions build.assets/charts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
FROM ubuntu:18.10
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y \
# Install dumb-init and ca-certificate. The dumb-init package is to ensure
# signals and orphaned processes are are handled correctly. The ca-certificate
# package is installed because the base Ubuntu image does not come with any
# certificate authorities.
#
# Note that /var/lib/apt/lists/* is cleaned up in the same RUN command as
# "apt-get update" to reduce the size of the image.
RUN apt-get update && apt-get upgrade -y && \
apt-get install --no-install-recommends -y \
dumb-init \
&& rm -rf /var/lib/apt/lists/*
ca-certificates \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*

# Bundle teleport and control binary
# Bundle "teleport", "tctl", and "tsh" binaries into image.
ADD teleport /usr/local/bin/teleport
ADD tctl /usr/local/bin/tctl
ADD tsh /usr/local/bin/tsh

# By setting this entry point, we expose make target as command
# By setting this entry point, we expose make target as command.
ENTRYPOINT ["/usr/bin/dumb-init", "teleport", "start", "-c", "/etc/teleport/teleport.yaml"]
2 changes: 1 addition & 1 deletion lib/auth/tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ func (s *TLSSuite) TestGetCertAuthority(c *check.C) {
role := services.NewImplicitRole()
role.SetName(user.GetName())
role.SetLogins(services.Allow, []string{user.GetName()})
err = s.server.Auth().UpsertRole(role, backend.Forever)
err = s.server.Auth().UpsertRole(role)
c.Assert(err, check.IsNil)

user.AddRole(role.GetName())
Expand Down