Extract Debian metadata files from Dockerfile (#6)

* Pull static files out of Dockerfile

Refactor the Debian package build so that static files live outside of the Dockerfile so we can lint them directly

This makes the layout more like what we do in the core tinypilot repo.

* Remove mkdir for DEBIAN folder

* Add blank line after shebang line

Author: mtlynch

.circleci/config.yml

@@ -1,5 +1,16 @@
 version: 2.1
 jobs:
+  check_bash:
+    docker:
+      - image: koalaman/shellcheck-alpine:v0.7.1
+    steps:
+      - run:
+          name: Install dependencies
+          command: apk add bash git openssh-client grep
+      - checkout
+      - run:
+          name: Run static analysis on bash scripts
+          command: ./dev-scripts/check-bash
   build_deb_pkg:
     docker:
       - image: cimg/base:stable
@@ -49,4 +60,7 @@ jobs:
 workflows:
   build:
     jobs:
-      - build_deb_pkg
+      - check_bash
+      - build_deb_pkg:
+          requires:
+            - check_bash

Dockerfile

@@ -15,8 +15,6 @@ ARG LIBNICE_VERSION="0.1.18"
 ARG LIBSRTP_VERSION="2.2.0"
 ARG LIBWEBSOCKETS_VERSION="v3.2-stable"
 
-COPY . /app
-
 RUN set -x && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -140,6 +138,8 @@ EOF
 
 RUN mkdir --parents "${PKG_DIR}"
 
+COPY ./debian-pkg "${PKG_DIR}"
+
 # Add Janus files to the Debian package.
 RUN cp --parents --recursive --no-dereference "${INSTALL_DIR}/etc/janus" \
     "${INSTALL_DIR}/bin/janus" \
@@ -160,8 +160,6 @@ RUN cp --parents --no-dereference /usr/lib/arm-linux-gnueabihf/libnice.so* \
     /usr/lib/libwebsockets.so* \
     "${PKG_DIR}/"
 
-RUN mkdir "${PKG_DIR}/DEBIAN"
-
 WORKDIR "${PKG_DIR}/DEBIAN"
 
 RUN cat > control <<EOF
@@ -175,29 +173,6 @@ Homepage: https://janus.conf.meetecho.com/
 Description: An open source, general purpose, WebRTC server
 EOF
 
-RUN cat > triggers <<EOF
-# Reindex shared libraries.
-activate-noawait ldconfig
-EOF
-
-RUN cat > preinst <<EOF
-#!/bin/bash
-systemctl disable --now janus.service > /dev/null 2>&1 || true
-EOF
-RUN chmod 0555 preinst
-
-RUN cat > postinst <<EOF
-#!/bin/bash
-systemctl enable --now janus.service > /dev/null 2>&1 || true
-EOF
-RUN chmod 0555 postinst
-
-RUN cat > postrm <<EOF
-#!/bin/bash
-systemctl disable --now janus.service > /dev/null 2>&1 || true
-EOF
-RUN chmod 0555 postrm
-
 RUN dpkg --build "${PKG_DIR}"
 
 FROM scratch as artifact

debian-pkg/DEBIAN/postinst

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+systemctl enable --now janus.service > /dev/null 2>&1 || true

debian-pkg/DEBIAN/postrm

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+systemctl disable --now janus.service > /dev/null 2>&1 || true

debian-pkg/DEBIAN/preinst

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+systemctl disable --now janus.service > /dev/null 2>&1 || true

debian-pkg/DEBIAN/triggers

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Reindex shared libraries.
+activate-noawait ldconfig

dev-scripts/check-bash

@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# Run static analysis on bash scripts.
+
+# Exit on first failing command.
+set -e
+
+# Exit on unset variable.
+set -u
+
+BASH_SCRIPTS=()
+
+while read -r filepath; do
+  if head -n 1 "${filepath}" | grep --quiet \
+    --regexp '#!/bin/bash' \
+    --regexp '#!/usr/bin/env bash' \
+    --regexp '#!/usr/sh' \
+    --regexp '#!/usr/bin/env sh' \
+    ; then
+      BASH_SCRIPTS+=("${filepath}")
+  fi
+done < <(git ls-files)
+
+readonly BASH_SCRIPTS
+
+shellcheck "${BASH_SCRIPTS[@]}"