Merge master into 6.0/stage

.github/workflows/main.yml

@@ -0,0 +1,47 @@
+on: [push, pull_request]
+
+jobs:
+  check-packages:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - run: docker build -t delphix-platform:latest docker
+      - run: ./scripts/docker-run.sh make packages
+  check-shellcheck:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: delphix/actions/shellcheck@master
+  check-shfmt:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: delphix/actions/shfmt@master
+  check-pylint:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.6'
+      - run: python3 -m pip install pylint
+      - run: python3 -m pip install netifaces
+      - run: pylint -d invalid-name,E0611 files/common/usr/bin/delphix-startup-screen
+  check-yapf:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.6'
+      - run: python3 -m pip install yapf
+      - run: yapf --diff --style google files/common/usr/bin/delphix-startup-screen
+  check-mypy:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.6'
+      - run: python3 -m pip install mypy
+      - run: mypy --ignore-missing-imports files/common/usr/bin/delphix-startup-screen

Makefile

@@ -24,11 +24,7 @@ VERSION := $(shell date '+%Y.%m.%d.%H')
 
 .PHONY: \
 	check \
-	package \
-	shellcheck \
-	shfmtcheck
-
-check: shellcheck shfmtcheck
+	package
 
 packages: $(addprefix package-,$(ALL_PLATFORMS))
 
@@ -47,9 +43,3 @@ package-%:
 	done
 
 	@mv -v ../delphix-platform-$*_*_amd64.deb artifacts
-
-shellcheck:
-	shellcheck $$(shfmt -f .)
-
-shfmtcheck:
-	shfmt -d .

docker/Dockerfile

@@ -34,11 +34,5 @@ RUN \
       devscripts \
       dpkg-dev \
       jq \
-      make \
-      shellcheck \
-      wget && \
+      make && \
   rm -rf /var/lib/apt/lists/*
-
-RUN wget -nv -O /usr/local/bin/shfmt \
-  https://github.com/mvdan/sh/releases/download/v2.4.0/shfmt_v2.4.0_linux_amd64 && \
-  chmod +x /usr/local/bin/shfmt

files/common/etc/update-motd.d/00-delphix

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 version=$(get-appliance-version --snapshot)
-printf "Welcome to Delphix %s\n" "$version"
+printf "Welcome to Delphix %s\\n" "$version"

files/common/lib/systemd/system/delphix-platform.service

@@ -18,7 +18,7 @@
 Description=Delphix Appliance Platform Service
 PartOf=delphix.target
 After=local-fs.target
-Before=rsync.service
+Before=rsync.service docker.service
 
 [Service]
 Type=oneshot