Browse Source

ci(other): cicd

Yi 1 year ago
parent
commit
88e733c194
4 changed files with 2 additions and 2 deletions
  1. 0 0
      .dockerignore
  2. 1 1
      Dockerfile
  3. 1 1
      Makefile
  4. 0 0
      nginx.conf

+ 0 - 0
docker/.dockerignore → .dockerignore


+ 1 - 1
docker/Dockerfile → Dockerfile

@@ -4,7 +4,7 @@ ENV WORKDIR=/kpt-system-web
 
 WORKDIR $WORKDIR
 
-COPY ./ $WORKDIR/
+COPY docker $WORKDIR/
 
 ARG version
 ENV COMMITID=$version

+ 1 - 1
Makefile

@@ -6,7 +6,7 @@ VERSION=$(shell git rev-parse --short HEAD)
 soybean-admin: soybean-admin-build soybean-admin-push
 
 soybean-admin-build:
-	docker build --build-arg version=$(VERSION) -t ${SoybeanAdminImg} -f docker/Dockerfile .
+	docker build --build-arg version=$(VERSION) -t ${SoybeanAdminImg} -f ./Dockerfile .
 
 soybean-admin-push:
 	docker push ${SoybeanAdminImg}

+ 0 - 0
docker/nginx.conf → nginx.conf