Some futzing with the static-musl branch

- Don't bother with the Docker shell scripts, which were one-liners
- docker/x86_musl => dist/docker/x86-alpine-linux-musl
- The rename of AES_cbc_encrypt is now permanently applied
- Run the test suite inside the static container
- Add copyright/license headers
- Move the pkg-config-rs patching script to the specific Docker directory
- Add Cargo.toml note about tracking the correct version of pkg-config.rs

.travis.yml

@@ -29,7 +29,7 @@ matrix:
       sudo: required
       dist: xenial
       rust: nightly
-      env: IMAGE=x86_64-musl
+      env: IMAGE=x86_64-alpine-linux-musl
   allow_failures:
     - rust: nightly
 
@@ -90,8 +90,8 @@ script:
       cargo build --verbose &&
       cargo test
     else
-      ./build-docker-image.sh $IMAGE &&
-      ./run-docker-image.sh $IMAGE
+      docker build -t ttci-$IMAGE dist/docker/$IMAGE/ &&
+      docker run -v $(pwd):/tectonic ttci-$IMAGE
     fi
 
 after_success: |

Cargo.toml

@@ -33,7 +33,7 @@ crate-type = ["rlib"]
 
 [build-dependencies]
 cc = "^1.0"
-pkg-config = "^0.3"
+pkg-config = "^0.3"  # note: sync dist/docker/*/pkg-config-rs.sh with the version in Cargo.lock
 regex = "^1.0"
 sha2 = "^0.8"
 

docker/x86_64-musl/Dockerfile → dist/docker/x86_64-alpine-linux-musl/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright 2018 The Tectonic Project
+# Licensed under the MIT License.
+
 FROM alpine:edge
 
 RUN apk update && \
@@ -31,12 +34,9 @@ ENV OPENSSL_DIR=/usr
 ENV CXXSTDLIB=""
 ENV RUSTFLAGS="-L /usr/lib -l static=stdc++ -C target-feature=+crt-static"
 
-# use a patched pkg-config-rs to allow static linking with system libraries
-# rename AES_cbc_encrypt to avoid name conflict with openssl
+# Use a patched pkg-config-rs to allow static linking with system libraries.
+# The --no-default-features flag removes serde-derive as a dep, which doesn't
+# work when linking statically (rust-lang#40147).
 CMD cd /tectonic && \
     echo -e "[patch.crates-io]\npkg-config = { path = \"/pkg-config-rs\" }" >> Cargo.toml && \
-    sed -i -e 's/AES_cbc_encrypt/AES_cbc_encrypt2/g' \
-          ./tectonic/dpx-dpxcrypt.h \
-          ./tectonic/dpx-pdfencrypt.c \
-          ./tectonic/dpx-dpxcrypt.c && \
-    cargo build --release
+    cargo test --release --no-default-features

docker/pkg-config-rs.sh → dist/docker/x86_64-alpine-linux-musl/pkg-config-rs.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright 2018 The Tectonic Project
+# Licensed under the MIT License.
 
 set -ex