improved

Author: christiangda

Dockerfile

@@ -18,11 +18,13 @@ COPY .build/${OS}-${ARCH}/aws_cloudwatch_exporter  /bin/aws_cloudwatch_exporter
 ARG PORT="9690"
 EXPOSE  ${PORT}
 
-USER    nobody
+RUN mkdir -p /home/nobody/.aws && chown -R nobody.nogroup /home/nobody
+ENV HOME="/home/nobody"
+USER nobody
 
 HEALTHCHECK CMD wget --spider -S "http://localhost:${PORT}/health" -T 60 2>&1 || exit 1
 
-VOLUME ["/metrics","/home/nobody"]
+VOLUME ["/home/nobody"]
 
 ENTRYPOINT  [ "/bin/aws_cloudwatch_exporter" ]
 # CMD  [ "/bin/aws_cloudwatch_exporter" ]

README.md

@@ -25,41 +25,16 @@ the same configuration key is defined as a `Env Var` this last will replace the
 #### Docker
 
 ```bash
-make && \
-make promu && \
-promu build --prefix .build/darwin-amd64 && \
-make docker DOCKER_REPO=docker.io/slashdevops
-
 docker run --rm \
-    -v ~/tmp/queries/m1.yaml:/metrics/m1.yaml \
-    -v ~/.aws:/credentials \
-    -v ~/.aws:/credentials \
+    -i \
+    -u nobody:nogroup \
+    --privileged \
+    -v ~/tmp/queries/m1.yaml:/home/nobody/m1.yaml:ro \
+    -v /tmp/:/home/nobody/tmp/:rw \
+    -v ~/.aws:/home/nobody/.aws:ro \
     -e "AWS_SDK_LOAD_CONFIG=1" \
-    -e "AWS_CONFIG_FILE=/credentials/.aws/config" \
-    -e "AWS_SHARED_CREDENTIALS_FILE=/credentials/.aws/credentials" \
-    -e "AWS_PROFILE=slashdevops" \
-    slashdevops/aws-cloudwatch-exporter-linux-amd64:develop metrics get --metricsFiles /metrics/m1.yaml \
-    --debug
-
-docker run --rm \
-    -v ~/tmp/queries/m1.yaml:/metrics/m1.yaml \
-    -v ~/.aws/credentials:/home/.aws/credentials:ro \
-    -v ~/.aws/config:/home/.aws/config:ro \
     -e "AWS_PROFILE=slashdevops" \
-    slashdevops/aws-cloudwatch-exporter-linux-amd64:develop metrics get --metricsFiles /metrics/m1.yaml \
-    --debug
-
-docker run --rm \
-    -v ~/tmp/queries/m1.yaml:/metrics/m1.yaml \
-    -e "AWS_REGION=eu-west-1" \
-    slashdevops/aws-cloudwatch-exporter-linux-amd64:develop metrics get --metricsFiles /metrics/m1.yaml \
-    --debug
-
-docker run --rm \
-    -v ~/tmp/queries/m1.yaml:/metrics/m1.yaml \
-    -v $HOME/.aws/credentials:/home/nobody/.aws/credentials -u nobody \
-    -v $HOME/.aws/config:/home/nobody/.aws/config -u nobody \
-    slashdevops/aws-cloudwatch-exporter-linux-amd64:develop ls -la /home/nobody/
+    slashdevops/aws-cloudwatch-exporter-linux-amd64:develop metrics get --metricsFiles /home/nobody/m1.yaml --outFile /home/nobody/tmp/out.yaml 
 ```
 
 #### Binary

cmd/metrics.go

@@ -97,8 +97,8 @@ func init() {
 	metricsGetCmd.Flags().StringP("outFormat", "", "yaml", "Output format for results, possible values: [yaml|json]")
 	metricsGetCmd.Flags().StringP("outFile", "", "", "Output file where to store the results.")
 
-	metricsCollectCmd.Flags().StringP("address", "", "127.0.0.1", "Server address, empty means all addresses")
-	metricsCollectCmd.Flags().StringP("port", "", "8080", "Server port")
+	metricsCollectCmd.Flags().StringP("address", "", appIP, "Server address, empty means all addresses")
+	metricsCollectCmd.Flags().Uint16P("port", "", appPort, "Server port")
 }
 
 func getCmd(cmd *cobra.Command, args []string) {
@@ -228,7 +228,7 @@ func collectCmd(cmd *cobra.Command, args []string) {
 	})
 
 	a, _ := cmd.Flags().GetString("address")
-	p, _ := cmd.Flags().GetString("port")
+	p, _ := cmd.Flags().GetUint16("port")
 	soc := fmt.Sprintf("%s:%v", a, p)
 
 	log.Infof("Starting test server on %s", soc)