From 56fd0deef3f9b670a5365e5fd3fd0f7da0150657 Mon Sep 17 00:00:00 2001 From: zryfish Date: Mon, 3 Aug 2020 14:49:40 +0800 Subject: [PATCH] fix some bugs (#2751) Signed-off-by: Jeff --- build/ks-apiserver/Dockerfile | 20 ++++++++------------ pkg/apis/types/v1beta1/register.go | 2 ++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index 87eae367a..05a4d0f15 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -2,19 +2,15 @@ # Use of this source code is governed by an Apache license # that can be found in the LICENSE file. FROM alpine:3.11 -ENV USER=kubesphere -ENV UID=1002 -# docker group -ENV GID=998 +RUN apk add --no-cache ca-certificates + +# To speed up building process, we copy binary directly from make +# result instead of building it again, so make sure you run the +# following command first before building docker image +# make ks-apiserver +# COPY /bin/cmd/ks-apiserver /usr/local/bin/ -RUN apk add --no-cache ca-certificates && \ - addgroup --gid "$GID" "$USER" && \ - adduser -D -g "" --ingroup "$USER" -u "$UID" "$USER" && \ - chown -R kubesphere:"$GID" /usr/local/bin/ks-apiserver - EXPOSE 9090 - -USER kubesphere -CMD ["sh"] \ No newline at end of file +CMD ["sh"] diff --git a/pkg/apis/types/v1beta1/register.go b/pkg/apis/types/v1beta1/register.go index 8f76ed240..346556ee8 100644 --- a/pkg/apis/types/v1beta1/register.go +++ b/pkg/apis/types/v1beta1/register.go @@ -72,6 +72,8 @@ func init() { &FederatedServiceList{}, &FederatedStatefulSet{}, &FederatedStatefulSetList{}, + &FederatedUser{}, + &FederatedUserList{}, &FederatedWorkspace{}, &FederatedWorkspaceList{}) }