Commit 8f3b6e91 authored by yunlzheng's avatar yunlzheng
Browse files

refact: move docker -> build/docker

parent 01094c90
Showing with 10 additions and 10 deletions
+10 -10
......@@ -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)
......
File moved
......@@ -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
......@@ -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
......@@ -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
File moved
File moved
File moved
File moved
#!/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 .
#!/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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment