Merge pull request #11 from concourse/bionic-base-image

migrating to ubuntu:bionic

README.md

@@ -133,10 +133,11 @@ environment is consistent across any `docker` enabled platform. When the docker
 image builds, the test are run inside the docker container, on failure they
 will stop the build.
 
-Run the tests with the following command:
+Run the tests with the following commands for both `alpine` and `ubuntu` images:
 
 ```sh
-docker build -t hg-resource .
+docker build -t hg-resource -f dockerfiles/alpine/Dockerfile .
+docker build -t hg-resource -f dockerfiles/ubuntu/Dockerfile .
 ```
 
 ### Contributing

assets/askpass.sh

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 echo "Private keys with passphrases are not supported." >&2
 exit 1

dockerfiles/ubuntu/Dockerfile

@@ -0,0 +1,35 @@
+FROM concourse/golang-builder as builder
+COPY . /go/src/github.com/concourse/hg-resource
+ENV CGO_ENABLED 0
+ENV GOPATH /go/src/github.com/concourse/hg-resource/Godeps/_workspace:${GOPATH}
+ENV PATH /go/src/github.com/concourse/hg-resource/Godeps/_workspace/bin:${PATH}
+RUN go build -o /assets/hgresource github.com/concourse/hg-resource/hgresource
+RUN set -e; for pkg in $(go list ./...); do \
+		go test -o "/tests/$(basename $pkg).test" -c $pkg; \
+	done
+
+FROM ubuntu:bionic AS resource
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      curl \
+      ca-certificates \
+      gnupg \
+      jq \
+      openssh-client \
+      mercurial \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /assets /opt/resource
+ADD assets/askpass.sh /opt/resource
+RUN chmod +x /opt/resource/*
+RUN ln -s /opt/resource/hgresource /opt/resource/in; ln -s /opt/resource/hgresource /opt/resource/out; ln -s /opt/resource/hgresource /opt/resource/check
+ADD hgrc /etc/mercurial/hgrc
+
+FROM resource AS tests
+COPY --from=builder /tests /go-tests
+RUN set -e; for test in /go-tests/*.test; do \
+		$test; \
+	done
+
+COPY /test /test
+RUN /test/all.sh
+
+FROM resource

test/all.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

test/helpers.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e -u
 

test/image.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

test/shunit2

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # $Id$
 # vim:et:ft=sh:sts=2:sw=2
 #

test/test_check.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

test/test_in.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

test/test_out.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e