Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kt Connect
Commits
8f3b6e91
Commit
8f3b6e91
authored
5 years ago
by
yunlzheng
Browse files
Options
Download
Email Patches
Plain Diff
refact: move docker -> build/docker
parent
01094c90
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
Makefile
+4
-4
Makefile
build/docker/apiserver/Dockerfile
+0
-0
build/docker/apiserver/Dockerfile
build/docker/dashboard/Dockerfile
+1
-1
build/docker/dashboard/Dockerfile
build/docker/dashboard/nginx/default.conf
+0
-0
build/docker/dashboard/nginx/default.conf
build/docker/shadow/Dockerfile
+1
-1
build/docker/shadow/Dockerfile
build/docker/shadow/Dockerfile_base
+2
-2
build/docker/shadow/Dockerfile_base
build/docker/shadow/Dockerfile_dlv
+0
-0
build/docker/shadow/Dockerfile_dlv
build/docker/shadow/loop.sh
+0
-0
build/docker/shadow/loop.sh
build/docker/shadow/run.sh
+0
-0
build/docker/shadow/run.sh
build/docker/shadow/sshd_config
+0
-0
build/docker/shadow/sshd_config
scripts/build-shadow
+1
-1
scripts/build-shadow
scripts/build-shadow-dlv
+1
-1
scripts/build-shadow-dlv
with
10 additions
and
10 deletions
+10
-10
Makefile
+
4
-
4
View file @
8f3b6e91
...
...
@@ -43,12 +43,12 @@ build-connect:
# build this image before shadow
build-shadow-base
:
docker build
-t
$(PREFIX)
/
$(SHADOW_BASE_IMAGE)
:
$(TAG)
-f
docker/shadow/Dockerfile_base .
docker build
-t
$(PREFIX)
/
$(SHADOW_BASE_IMAGE)
:
$(TAG)
-f
build/
docker/shadow/Dockerfile_base .
# build shadow
build-shadow
:
GOARCH
=
amd64
GOOS
=
linux go build
-gcflags
"all=-N -l"
-o
artifacts/shadow/shadow-linux-amd64 cmd/shadow/main.go
docker build
-t
$(PREFIX)
/
$(SHADOW_IMAGE)
:
$(TAG)
-f
docker/shadow/Dockerfile .
docker build
-t
$(PREFIX)
/
$(SHADOW_IMAGE)
:
$(TAG)
-f
build/
docker/shadow/Dockerfile .
# release shadow
release-shadow
:
...
...
@@ -61,11 +61,11 @@ build-shadow-dlv:
build-dashboard
:
build-frontend build-server
build-frontend
:
docker build
-t
$(PREFIX)
/
$(DASHBOARD_IMAGE)
:
$(TAG)
-f
docker/dashboard/Dockerfile .
docker build
-t
$(PREFIX)
/
$(DASHBOARD_IMAGE)
:
$(TAG)
-f
build/
docker/dashboard/Dockerfile .
build-server
:
CGO_ENABLED
=
0
GOOS
=
linux
GOARCH
=
amd64 go build
-o
artifacts/apiserver/apiserver-linux-amd64 cmd/server/main.go
docker build
-t
$(PREFIX)
/
$(SERVER_IMAGE)
:
$(TAG)
-f
docker/apiserver/Dockerfile .
docker build
-t
$(PREFIX)
/
$(SERVER_IMAGE)
:
$(TAG)
-f
build/
docker/apiserver/Dockerfile .
release-dashboard
:
docker push
$(PREFIX)
/
$(DASHBOARD_IMAGE)
:
$(TAG)
...
...
This diff is collapsed.
Click to expand it.
docker/apiserver/Dockerfile
→
build/
docker/apiserver/Dockerfile
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
docker/dashboard/Dockerfile
→
build/
docker/dashboard/Dockerfile
+
1
-
1
View file @
8f3b6e91
...
...
@@ -9,6 +9,6 @@ RUN cnpm run build
FROM
nginx:1.15
ENV
APP_ENV PROD
COPY
--from=build-deps /usr/src/app/build /usr/share/nginx/html
ADD
docker/dashboard/nginx/default.conf /etc/nginx/conf.d/default.conf
ADD
build/
docker/dashboard/nginx/default.conf /etc/nginx/conf.d/default.conf
EXPOSE
80
CMD
["nginx", "-g", "daemon off;"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker/dashboard/nginx/default.conf
→
build/
docker/dashboard/nginx/default.conf
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
docker/shadow/Dockerfile
→
build/
docker/shadow/Dockerfile
+
1
-
1
View file @
8f3b6e91
...
...
@@ -7,7 +7,7 @@ FROM registry.cn-hangzhou.aliyuncs.com/rdc-incubator/shadow-base
COPY
artifacts/shadow/shadow-linux-amd64 /usr/sbin/shadow-linux-amd64
COPY
--from=0 /go/bin/dlv /usr/sbin/dlv
RUN
apt-get
install
-y
net-tools
ADD
docker/shadow/run.sh /run.sh
ADD
build/
docker/shadow/run.sh /run.sh
RUN
chmod
755 /run.sh
ENTRYPOINT
["/run.sh"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker/shadow/Dockerfile_base
→
build/
docker/shadow/Dockerfile_base
+
2
-
2
View file @
8f3b6e91
...
...
@@ -10,8 +10,8 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
ENV NOTVISIBLE "in users profile"
RUN echo "export VISIBLE=now" >> /etc/profile
ADD docker/shadow/loop.sh /root/loop.sh
ADD docker/shadow/sshd_config /etc/ssh/sshd_config
ADD
build/
docker/shadow/loop.sh /root/loop.sh
ADD
build/
docker/shadow/sshd_config /etc/ssh/sshd_config
RUN chmod +rw /etc/ssh/sshd_config
EXPOSE 22
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker/shadow/Dockerfile_dlv
→
build/
docker/shadow/Dockerfile_dlv
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
docker/shadow/loop.sh
→
build/
docker/shadow/loop.sh
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
docker/shadow/run.sh
→
build/
docker/shadow/run.sh
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
docker/shadow/sshd_config
→
build/
docker/shadow/sshd_config
+
0
-
0
View file @
8f3b6e91
File moved
This diff is collapsed.
Click to expand it.
scripts/build-shadow
+
1
-
1
View file @
8f3b6e91
#!/bin/bash
TAG
=
$(
echo
$TRAVIS_BRANCH
|
sed
"s/
\/
/-/"
)
TAG
=
${
TAG
:-
latest
}
docker build
-t
registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:
$TAG
-f
docker/shadow/Dockerfile
.
docker build
-t
registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:
$TAG
-f
build/
docker/shadow/Dockerfile
.
This diff is collapsed.
Click to expand it.
scripts/build-shadow-dlv
+
1
-
1
View file @
8f3b6e91
#!/bin/bash
TAG
=
${
1
:-
dlv
}
docker build
-t
registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:
$TAG
-f
docker/shadow/Dockerfile_dlv
.
&&
\
docker build
-t
registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:
$TAG
-f
build/
docker/shadow/Dockerfile_dlv
.
&&
\
docker push registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:
$TAG
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help