Merge pull request #1 from jaisor/dev

Dev
jaisor · Dec 12, 2023 · 95889c0 · 95889c0
2 parents f6f9b98 + c58f95b
commit 95889c0
Show file tree

Hide file tree

Showing 9 changed files with 561 additions and 102 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -18,26 +18,29 @@ jobs:
       contents: read
       #
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
-
-      - name: Log in to registry
-        run: echo "${{ secrets.CRTOKEN }}" | docker login ghcr.io -u $ --password-stdin
-        #
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-          # This changes all uppercase characters to lowercase.
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # This strips the git ref prefix from the version.
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # This strips the "v" prefix from the tag name.
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # This uses the Docker `latest` tag convention.
-          [ "$VERSION" == "main" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CRTOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,23 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Nodemon Launch Server",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "runtimeExecutable": "nodemon",
+      "runtimeArgs": [
+          "--inspect=5858"
+      ],
+      "program": "${workspaceFolder}\\src\\index.js",
+      "restart": true,
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "env": {
+        "LOG_LEVEL": "info"
+      }
+    },
     {
       "type": "node",
       "request": "launch",

diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,7 @@ FROM node:16-slim AS build
 RUN mkdir -p /config
 
 ENV PORT=8080
+ENV LOG_LEVEL=info
 
 WORKDIR /usr/src/app
 

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ docker build -t tesla-api-prometheus-exporter:latest .
 
 ```
 docker run -dit --restart unless-stopped --name tesla-api-prometheus-exporter \
-  -v .config:/config \
-  -e CONFIG_PATH=/config -p 9004:8080 \
+  -v .config:/config -p 9004:8080 \
+  -e CONFIG_PATH=/config -e LOG_LEVEL=info \
   tesla-api-prometheus-exporter:latest
 ```