cleaned dockerfiles

kyma-incubator · Nov 10, 2020 · 69e66f2 · 69e66f2
1 parent 0903a8b
commit 69e66f2
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 133 deletions.
diff --git a/examples/combined-odata-mock/Dockerfile b/examples/combined-odata-mock/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine
+FROM node:14-alpine
 RUN apk --no-cache upgrade
 
 WORKDIR /app

diff --git a/examples/combined-openapi-mock/Dockerfile b/examples/combined-openapi-mock/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine
+FROM node:14-alpine
 RUN apk --no-cache upgrade
 
 WORKDIR /app

diff --git a/examples/kyma-mock/Dockerfile b/examples/kyma-mock/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine
+FROM node:14-alpine
 RUN apk --no-cache upgrade
 
 WORKDIR /app

diff --git a/examples/odata-mock/Dockerfile b/examples/odata-mock/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine
+FROM node:14-alpine
 RUN apk --no-cache upgrade
 
 WORKDIR /app

diff --git a/examples/openapi-mock/Dockerfile b/examples/openapi-mock/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine
+FROM node:14-alpine
 RUN apk --no-cache upgrade
 
 WORKDIR /app

diff --git a/modules/api-server/.dockerignore b/modules/api-server/.dockerignore
diff --git a/modules/api-server/Dockerfile b/modules/api-server/Dockerfile
diff --git a/modules/api-server/Makefile b/modules/api-server/Makefile
@@ -6,17 +6,9 @@ resolve:
 validate:
 	npm test
 
-docker-build:
-	docker build -t $(APP_NAME):latest .
+docker-build: ;
 
-docker-push:
-	#DOCKER_TAG comes as parameter from outside -> make docker-push DOCKER_TAG=master
-	echo $(DOCKER_TAG)
-	docker tag $(APP_NAME):latest $(IMG):$(DOCKER_TAG)
-	docker push $(IMG):$(DOCKER_TAG)
-	#also push latest
-	docker tag $(IMG):$(DOCKER_TAG) $(IMG):latest
-	docker push $(IMG):latest
+docker-push: ;
 
 clean:
 	rm -rf ./node_modules ./logs

diff --git a/modules/cockpit/.dockerignore b/modules/cockpit/.dockerignore
diff --git a/modules/cockpit/Dockerfile b/modules/cockpit/Dockerfile
diff --git a/modules/cockpit/Makefile b/modules/cockpit/Makefile
@@ -3,17 +3,9 @@ IMG = $(DOCKER_PUSH_REPOSITORY)$(DOCKER_PUSH_DIRECTORY)/$(APP_NAME)
 resolve:
 	npm install
 
-docker-build:
-	docker build -t $(APP_NAME):latest .
+docker-build: ;
 
-docker-push:
-	#DOCKER_TAG comes as parameter from outside -> make docker-push DOCKER_TAG=master
-	echo $(DOCKER_TAG)
-	docker tag $(APP_NAME):latest $(IMG):$(DOCKER_TAG)
-	docker push $(IMG):$(DOCKER_TAG)
-	#also push latest
-	docker tag $(IMG):$(DOCKER_TAG) $(IMG):latest
-	docker push $(IMG):latest
+docker-push: ;
 
 clean:
 	rm -rf ./node_modules

diff --git a/modules/odata-mock/.dockerignore b/modules/odata-mock/.dockerignore
diff --git a/modules/odata-mock/Dockerfile b/modules/odata-mock/Dockerfile
diff --git a/modules/odata-mock/Makefile b/modules/odata-mock/Makefile
@@ -6,17 +6,9 @@ resolve:
 validate:
 	npm test
 
-docker-build:
-	docker build -t $(APP_NAME):latest .
+docker-build: ;
 
-docker-push:
-	#DOCKER_TAG comes as parameter from outside -> make docker-push DOCKER_TAG=master
-	echo $(DOCKER_TAG)
-	docker tag $(APP_NAME):latest $(IMG):$(DOCKER_TAG)
-	docker push $(IMG):$(DOCKER_TAG)
-	#also push latest
-	docker tag $(IMG):$(DOCKER_TAG) $(IMG):latest
-	docker push $(IMG):latest
+docker-push: ;
 
 clean:
 	rm -rf ./node_modules ./requests.log ./n_odata_server.log

diff --git a/modules/openapi-mock/.dockerignore b/modules/openapi-mock/.dockerignore
diff --git a/modules/openapi-mock/Dockerfile b/modules/openapi-mock/Dockerfile
diff --git a/modules/openapi-mock/Makefile b/modules/openapi-mock/Makefile
@@ -6,17 +6,9 @@ resolve:
 validate:
 	npm test
 
-docker-build:
-	docker build -t $(APP_NAME):latest .
+docker-build: ;
 
-docker-push:
-	#DOCKER_TAG comes as parameter from outside -> make docker-push DOCKER_TAG=master
-	echo $(DOCKER_TAG)
-	docker tag $(APP_NAME):latest $(IMG):$(DOCKER_TAG)
-	docker push $(IMG):$(DOCKER_TAG)
-	#also push latest
-	docker tag $(IMG):$(DOCKER_TAG) $(IMG):latest
-	docker push $(IMG):latest
+docker-push: ;
 
 clean:
 	rm -rf ./node_modules ./requests.log ./generated