Merge pull request #53 from mountaindude/master

2.3.3 RC1

.drone.yml

@@ -1,29 +1,29 @@
-kind: pipeline
-type: docker
-name: linux-amd64
-
-platform:
-  arch: amd64
-  os: linux
-
-steps:
-- name: docker
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: dockerhub_username
-    password:
-      from_secret: dockerhub_password
-    repo: ptarmiganlabs/butler-cw
-    dockerfile: Dockerfile.amd64
-    context: 
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-
-  when:
-    event:
-    - push
-    - tag
+# kind: pipeline
+# type: docker
+# name: linux-amd64
+
+# platform:
+#   arch: amd64
+#   os: linux
+
+# steps:
+# - name: docker
+#   image: plugins/docker
+#   settings:
+#     username:
+#       from_secret: dockerhub_username
+#     password:
+#       from_secret: dockerhub_password
+#     repo: ptarmiganlabs/butler-cw
+#     dockerfile: Dockerfile.amd64
+#     context: 
+#     auto_tag: true
+#     auto_tag_suffix: linux-amd64
+
+#   when:
+#     event:
+#     - push
+#     - tag
 
 
 ---
@@ -54,8 +54,8 @@ trigger:
   - push
   - tag
 
-depends_on:
-- linux-amd64
+# depends_on:
+# - linux-amd64
 
 
 ---
@@ -87,7 +87,7 @@ trigger:
   - tag
 
 depends_on:
-- linux-amd64
+- linux-arm64
 
 
 

.github/workflows/docker-image-build.yml

@@ -0,0 +1,91 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+# Inspiration
+# https://github.com/actions/starter-workflows/blob/main/ci/docker-publish.yml
+
+name: Build Docker image CI
+
+on:
+  push:
+    branches: [ master ]
+    # Publish semver tags as releases.
+    tags: [ 'v*.*.*' ]
+  # push:
+  #   branches: [ master ]
+  #   # Publish semver tags as releases.
+  #   tags: [ 'v*.*.*' ]    
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # Login against a Docker registry except on PR
+      # https://github.com/marketplace/actions/docker-login
+      # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#github-context
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        if: |
+          github.event_name != 'pull_request' 
+        # if: |
+        #   github.event_name != 'pull_request'  ||
+        #   github.repository_owner == 'ptarmiganlabs'
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/marketplace/actions/docker-metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # images: ${{ env.IMAGE_NAME }}
+          images: ${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Show Docker tags that will be used
+        run: echo '${{ steps.meta.outputs.tags }}'
+
+      - name: Show Docker labels that will be used
+        run: echo '${{ steps.meta.outputs.labels }}'
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: |
+            linux/amd64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+    env:
+      CI: true

changelog.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 2.3.3
+
+- Dependencies updated to stay sharp and secure.
+- Switched to using GitHub Actions for building linux/amd64 Docker images.
+
 ## 2.3.2
 
 - Dependencies updated to stay sharp and secure.

docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3.3'
 services:
   butler-cw:
-    image: ptarmiganlabs/butler-cw:2.3.2
+    image: ptarmiganlabs/butler-cw:2.3.3
     restart: always
     container_name: butler-cw
     volumes:

docker/manifest.tmpl

@@ -6,11 +6,6 @@ tags:
 {{/each}}
 {{/if}}
 manifests:
-  -
-    image: ptarmiganlabs/butler-cw:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
   -
     image: ptarmiganlabs/butler-cw:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:

index.js

@@ -184,7 +184,7 @@ try {
 function loadAppConfig(appConfig) {
     // Load app config doc, or throw exception on error
     try {
-        var appConfigDoc = yaml.safeLoad(appConfigYaml);
+        var appConfigDoc = yaml.load(appConfigYaml);
         logger.log(
             'debug',
             'Loading app config using following config:\n ' + JSON.stringify(appConfigDoc, null, 2),