Merge pull request #390 from ampproject/master

Merge master into release

Author: banaag

docker/Dockerfile

@@ -13,18 +13,34 @@
 # limitations under the License.
 
 # Use an official Go runtime as a parent image
-FROM golang:1.11
+FROM golang:1.13
+
+ENV GO111MODULE=on
 
 # Install AMP Packager
+# Run this if you want to go off master branch.
+# RUN go get -v github.com/ampproject/amppackager/cmd/amppkg@master
 RUN go get -v github.com/ampproject/amppackager/cmd/amppkg
 
+# Install git
+RUN apt-get update \
+    && apt-get install -y git
+
+# Clone amppackager files so we can use b3 directory
+WORKDIR /data
+# Run this if you clone from master branch.
+# RUN git clone -b master https://github.com/ampproject/amppackager.git /data/amppackager
+RUN git clone https://github.com/ampproject/amppackager.git /data/amppackager
+
 # Seed the ocsp cache
-WORKDIR /go/src/github.com/ampproject/amppackager/testdata/b3/
+WORKDIR /data/amppackager/testdata/b3
 RUN ./seedcache.sh
 
 WORKDIR /go/src/app
+
 # Copy the AMP packager binary into our app dir inside the container.
 RUN cp /go/bin/amppkg .
+
 # Copy example config file into container.
 COPY amppkg.example.toml .
 

docker/amppkg.example.toml

@@ -3,8 +3,8 @@
 # See https://github.com/ampproject/amppackager/blob/master/amppkg.example.toml
 # for more information and details on other possible config options.
 
-CertFile = '/go/src/github.com/ampproject/amppackager/testdata/b3/fullchain.cert'
-KeyFile = '/go/src/github.com/ampproject/amppackager/testdata/b3/server.privkey'
+CertFile = '/data/amppackager/testdata/b3/fullchain.cert'
+KeyFile = '/data/amppackager/testdata/b3/server.privkey'
 OCSPCache = '/tmp/amppkg-ocsp'
 
 [[URLSet]]

testdata/b3/ca.ocsp.cert

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----	
+MIIDUTCCAjmgAwIBAgIJALoE1bsaMrFKMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV	
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRMwEQYDVQQKDApHb29nbGUgTExD	
+MRkwFwYDVQQDDBBvY3NwLmV4YW1wbGUuY29tMB4XDTE4MTEwNTE5MzIxMloXDTE4	
+MTIwNTE5MzIxMlowUjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx	
+EzARBgNVBAoMCkdvb2dsZSBMTEMxGTAXBgNVBAMMEG9jc3AuZXhhbXBsZS5jb20w	
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC52bjEZwQIt5pIZY712P6n	
+bQOoRGKmalU6SksHjhVx8x9358Fjs+z1S1xm+HwU8LDj82wapj2/GZbLgk6wiYeS	
+F17a4cKbdOfZUqQiQpQfciABS3sd2ZG0YghR/VdTHa3mH56lX90Z/3pq0KlwIDk1	
+U/PpKYaWwC1Ywpj1COEJ9OmdTjcoPQ1nEc1vKdlyjlAvDYqKptrK2grGykvu0Rh2	
+ZeJ99YSSYknh6zx6U3FWtKlmPgMjSWO2gtpbMLPI3Uehde0b3Bq8JntjPvbh8gLo	
+GaOEsvvDgTfFRpRkNqMAjLVfz/zol9CpBdggg4Fyj9J0CGjM9f1ZBhXLmtoxkAQj	
+AgMBAAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcD	
+CTANBgkqhkiG9w0BAQsFAAOCAQEAStm0n/tspDf5ooVy8VoQslMdeMpBDe7VPhzp	
+Fl9HvTKtxxSohtt7BhGN7HzSgW5bAqeGUxiQ7aiizv5NJv348j+aI/+cX/nOo+VG	
+n60NAkkmKA8MW1e04kLWr3JL+qTejv9HXM3aeik80lyjqOKd5ZGxHFsdObto7I+U	
+Y6EC3r300/sVSgluYrSr3qpS2OwdY0D/8mfp7H3gXQQfNT3d0tSq4lBCGQfz8Gwe	
+tpEaPQWptq0nO5U5tZqMNmZluHcUxaMMd99kCgDCDQkSQO3TSqEP4guO73h8TYoM	
+fIV5BaJd560e1noyYxpFuiN35bUC3m49i5WcG7ZxZodoYclYRA==	
+-----END CERTIFICATE-----

testdata/b3/index.txt

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Seed the OCSP cache using the fake test certs. Do NOT run this if you
+# are using real certificates with the AMP Packager.
+
+openssl ocsp -index ./index.txt -rsigner ca.ocsp.cert -rkey ca.privkey -CA ca.cert -ndays 7 -issuer ca.cert -cert server.cert -respout /tmp/amppkg-ocsp