build: customize image time zone

Author: zhufuyi

Makefile

@@ -134,18 +134,30 @@ image-build-local: build
 .PHONY: image-build
 # Build image for remote repositories, use binary files to build, e.g. make image-build REPO_HOST=addr TAG=latest
 image-build:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-build REPO_HOST=xxx"; \
+		exit 1; \
+	fi
 	@bash scripts/image-build.sh $(REPO_HOST) $(TAG)
 
 
 .PHONY: image-build2
 # Build image for remote repositories, phase II build, e.g. make image-build2 REPO_HOST=addr TAG=latest
 image-build2:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-build2 REPO_HOST=xxx"; \
+		exit 1; \
+	fi
 	@bash scripts/image-build2.sh $(REPO_HOST) $(TAG)
 
 
 .PHONY: image-push
 # Push docker image to remote repositories, e.g. make image-push REPO_HOST=addr TAG=latest
 image-push:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-push REPO_HOST=xxx TAG=latest"; \
+		exit 1; \
+	fi
 	@bash scripts/image-push.sh $(REPO_HOST) $(TAG)
 
 

Makefile-for-http

@@ -87,18 +87,30 @@ image-build-local: build
 .PHONY: image-build
 # Build image for remote repositories, use binary files to build, e.g. make image-build REPO_HOST=addr TAG=latest
 image-build:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-build REPO_HOST=xxx"; \
+		exit 1; \
+	fi
 	@bash scripts/image-build.sh $(REPO_HOST) $(TAG)
 
 
 .PHONY: image-build2
 # Build image for remote repositories, phase II build, e.g. make image-build2 REPO_HOST=addr TAG=latest
 image-build2:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-build2 REPO_HOST=xxx"; \
+		exit 1; \
+	fi
 	@bash scripts/image-build2.sh $(REPO_HOST) $(TAG)
 
 
 .PHONY: image-push
 # Push docker image to remote repositories, e.g. make image-push REPO_HOST=addr TAG=latest
 image-push:
+	@if [ -z "$(REPO_HOST)" ]; then \
+		echo "ERROR: REPO_HOST is required. Usage: make image-push REPO_HOST=xxx TAG=latest"; \
+		exit 1; \
+	fi
 	@bash scripts/image-push.sh $(REPO_HOST) $(TAG)
 
 

cmd/perftest/Dockerfile

@@ -1,12 +1,6 @@
 FROM alpine:latest
 LABEL maintainer="zhufuyi <[email protected]>"
 
-# set the time zone to Shanghai
-#RUN apk add tzdata  \
-#    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-#    && echo "Asia/Shanghai" > /etc/timezone \
-#    && apk del tzdata
-
 COPY perftest /app/perftest
 RUN chmod +x /app/perftest
 

cmd/perftest/build-perftest-image.sh

@@ -39,9 +39,9 @@ checkResult $?
 rmFile perftest
 
 # delete none image
-noneImages=$(docker images --filter "dangling=true" -q)
+noneImages=$(docker images --filter "dangling=true" -q | grep "${zhufuyi/perftest}")
 if [ -n "$noneImages" ]; then
-    docker rmi $noneImages > /dev/null
+    docker rmi $noneImages > /dev/null 2>&1 || true
 fi
 
 # push image to docker hub

deployments/docker-compose/docker-compose.yml

@@ -8,6 +8,9 @@ services:
     command: ["./serverNameExample", "-c", "/app/configs/serverNameExample.yml"]
     volumes:
       - $PWD/configs:/app/configs
+      - /etc/localtime:/etc/localtime:ro  # mount the local time file
+    #environment:
+    #  - TZ=Asia/Shanghai
 # todo generate docker-compose.yml code for http or grpc here
 # delete the templates code start
     ports:

deployments/kubernetes/serverNameExample-deployment.yml

@@ -31,7 +31,13 @@ spec:
             - name: server-name-example-vl
               mountPath: /app/configs/
               readOnly: true
-# todo generate k8s-deployment.yml code for http or grpc here
+            - name: host-timezone
+              mountPath: /etc/localtime
+              readOnly: true
+          #env:
+          #  - name: TZ
+          #    value: "Asia/Shanghai"
+          # todo generate k8s-deployment.yml code for http or grpc here
 # delete the templates code start
           ports:
             - name: http-port
@@ -73,3 +79,7 @@ spec:
         - name: server-name-example-vl
           configMap:
             name: server-name-example-config
+        - name: host-timezone
+          hostPath:
+            path: /etc/localtime
+            type: File

scripts/build/Dockerfile

@@ -1,12 +1,6 @@
 FROM alpine:latest
 MAINTAINER zhufuyi "[email protected]"
 
-# set the time zone to Shanghai
-RUN apk add tzdata  \
-    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && apk del tzdata
-
 # todo generate dockerfile code for http or grpc here
 # delete the templates code start
 

scripts/build/Dockerfile_build

@@ -28,12 +28,6 @@ RUN cd $GOPATH/pkg/mod/github.com/grpc-ecosystem/[email protected] \
 FROM alpine:latest
 MAINTAINER zhufuyi "[email protected]"
 
-# set the time zone to Shanghai
-RUN apk add tzdata  \
-    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && apk del tzdata
-
 # add curl, used in the http service check, if deployed in k8s, can be installed without
 RUN apk add curl
 # add grpc_health_probe for health check of grpc service

scripts/deploy-binary.sh

@@ -2,21 +2,26 @@
 
 set serviceName "serverNameExample"
 
+if {$argc < 3} {
+    puts "Usage: $argv0 username password ipAddr"
+    exit 1
+}
+
 # parameters
 set username [lindex $argv 0]
 set password [lindex $argv 1]
-set hostname [lindex $argv 2]
+set ipAddr [lindex $argv 2]
 
 set timeout 30
 
-spawn scp -r ./${serviceName}-binary.tar.gz ${username}@${hostname}:/tmp/
+spawn scp -r ./${serviceName}-binary.tar.gz ${username}@${ipAddr}:/tmp/
 #expect "*yes/no*"
 #send  "yes\r"
 expect "*password:*"
 send  "${password}\r"
 expect eof
 
-spawn ssh ${username}@${hostname}
+spawn ssh ${username}@${ipAddr}
 #expect "*yes/no*"
 #send  "yes\r"
 expect "*password:*"

scripts/image-build-local.sh

@@ -48,8 +48,8 @@ if [ -d "${DOCKERFILE_PATH}/configs" ]; then
 fi
 
 # delete none image
-noneImages=$(docker images | grep "<none>" | awk '{print $3}')
+noneImages=$(docker images | grep "${IMAGE_NAME}" | grep "<none>" | awk '{print $3}')
 if [ "X${noneImages}" != "X" ]; then
-  docker rmi ${noneImages} > /dev/null
+  docker rmi ${noneImages} > /dev/null 2>&1 || true
 fi
 exit 0