Fix the pebble fetch script (#6765)

This PR updates and fixes `pebble-fetch.sh` considering latest improvements done on Pebble, to start a working instance.

* Fix the pebble fetch script

* Update pebble-fetch.sh

* Update tox.ini

tests/pebble-fetch.sh

@@ -2,7 +2,7 @@
 # Download and run Pebble instance for integration testing
 set -xe
 
-PEBBLE_VERSION=2018-11-02
+PEBBLE_VERSION=v1.0.1
 
 # We reuse the same GOPATH-style directory than for Boulder.
 # Pebble does not need it, but it will make the installation consistent with Boulder's one.
@@ -13,15 +13,32 @@ mkdir -p ${PEBBLEPATH}
 
 cat << UNLIKELY_EOF > "$PEBBLEPATH/docker-compose.yml"
 version: '3'
-
 services:
- pebble:
+  pebble:
-  image: letsencrypt/pebble:${PEBBLE_VERSION}
+    image: letsencrypt/pebble:${PEBBLE_VERSION}
-  command: pebble -strict ${PEBBLE_STRICT:-false} -dnsserver 10.77.77.1
+    command: pebble -dnsserver 10.30.50.3:8053
-  ports:
+    environment:
-    - 14000:14000
-  environment:
     - PEBBLE_VA_NOSLEEP=1
+    ports:
+      - 14000:14000
+    networks:
+      acmenet:
+        ipv4_address: 10.30.50.2
+  challtestsrv:
+    image: letsencrypt/pebble-challtestsrv:${PEBBLE_VERSION}
+    command: pebble-challtestsrv -defaultIPv6 "" -defaultIPv4 10.30.50.1
+    ports:
+      - 8055:8055
+    networks:
+      acmenet:
+        ipv4_address: 10.30.50.3
+networks:
+  acmenet:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 10.30.50.0/24
 UNLIKELY_EOF
 
 docker-compose -f "$PEBBLEPATH/docker-compose.yml" up -d pebble

tox.ini

@@ -166,7 +166,6 @@ passenv =
     HOME
     GOPATH
     PEBBLEPATH
-    PEBBLE_STRICT
 setenv =
     SERVER=https://localhost:14000/dir