Merge remote-tracking branch 'upstream/master'

Author: jamie-pate

README.md

@@ -97,7 +97,7 @@ Tracks the commits in a [git](http://git-scm.com/) repository.
   `gpg_keyserver`. The ids can be short id, long id or fingerprint.
 
 * `gpg_keyserver`: *Optional.* GPG keyserver to download the public keys from.
-  Defaults to `hkp:///keys.gnupg.net/`.
+  Defaults to `hkp://keyserver.ubuntu.com/`.
 
 * `git_crypt_key`: *Optional.* Base64 encoded
   [git-crypt](https://github.com/AGWA/git-crypt) key. Setting this will

assets/in

@@ -46,7 +46,7 @@ commit_verification_keys=$(jq -r '(.source.commit_verification_keys // [])[]' <<
 tag_filter=$(jq -r '.source.tag_filter // ""' <<< "$payload")
 tag_regex=$(jq -r '.source.tag_regex // ""' <<< "$payload")
 fetch_tags=$(jq -r '.params.fetch_tags' <<< "$payload")
-gpg_keyserver=$(jq -r '.source.gpg_keyserver // "hkp://ipv4.pool.sks-keyservers.net/"' <<< "$payload")
+gpg_keyserver=$(jq -r '.source.gpg_keyserver // "hkp://keyserver.ubuntu.com/"' <<< "$payload")
 disable_git_lfs=$(jq -r '(.params.disable_git_lfs // false)' <<< "$payload")
 clean_tags=$(jq -r '(.params.clean_tags // false)' <<< "$payload")
 short_ref_format=$(jq -r '(.params.short_ref_format // "%s")' <<< "$payload")
@@ -189,6 +189,8 @@ fi
 # Using https://github.com/mdomke/concourse-email-resource for example
 git --no-pager log -1 --pretty=format:"%ae" > .git/committer
 
+git --no-pager log -1 --pretty=format:"%an" > .git/committer_name
+
 # Store git-resource returned version ref .git/ref. Useful to know concourse
 # pulled ref in following tasks and resources.
 echo "${return_ref}" > .git/ref

dockerfiles/alpine/Dockerfile

@@ -2,6 +2,7 @@ ARG base_image=alpine:latest
 
 FROM ${base_image} AS resource
 
+RUN apk update && apk upgrade
 RUN apk --no-cache add \
   bash \
   curl \
@@ -11,8 +12,7 @@ RUN apk --no-cache add \
   gnupg \
   gzip \
   jq \
-  libressl \
-  libressl-dev \
+  openssl-dev \
   make \
   g++ \
   openssh \

dockerfiles/ubuntu/Dockerfile

@@ -2,8 +2,8 @@ ARG base_image
 
 FROM ${base_image} AS resource
 
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
+RUN apt update && apt upgrade -y -o Dpkg::Options::="--force-confdef"
+RUN apt install -y --no-install-recommends \
     curl \
     gnupg \
     gzip \
@@ -17,12 +17,12 @@ RUN apt-get update \
     software-properties-common
 
 RUN apt-add-repository ppa:git-core/ppa \
-  && apt-get update \
-  && apt-get install -y git \
+  && apt update \
+  && apt install -y git \
   && rm -rf /var/lib/apt/lists/*
 
 RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-RUN apt-get install -y git-lfs
+RUN apt install -y git-lfs
 
 WORKDIR /root
 RUN git clone https://github.com/proxytunnel/proxytunnel.git && \
@@ -193,7 +193,7 @@ ADD test/ /tests
 RUN /tests/all.sh
 
 FROM resource AS integrationtests
-RUN apt-get update && apt-get install -y squid
+RUN apt update && apt install -y squid
 ADD test/ /tests/test
 ADD integration-tests /tests/integration-tests
 RUN /tests/integration-tests/integration.sh