Skip to content

Commit 2f1bd0d

Browse files
committed
Added mkcert to use https inside container and reorder docker-compose file
1 parent 944d679 commit 2f1bd0d

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

backstopjsBuild/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (userad
1515

1616
# Add sudo and sudoers in manner similar to other ddev containers
1717
RUN apt update && apt install -y sudo; apt clean -qq && rm -rf /var/lib/apt/lists/*; echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/ddev-backstop && chmod 440 /etc/sudoers.d/ddev-backstop
18+
19+
# Install mkcert
20+
RUN apt update --fix-missing; apt install -y curl libnss3-tools; curl -JLO "https://dl.filippo.io/mkcert/latest?for=linux/amd64"; chmod +x mkcert-v*-linux-amd64; cp mkcert-v*-linux-amd64 /usr/local/bin/mkcert
21+
22+
USER $username

backstopjsBuild/entrypoint.sh

+3
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ if [ -n "$routerIp" ]; then
1414
IFS=$OIFS
1515
fi
1616

17+
#Adding certs
18+
CAROOT=/mnt/ddev-global-cache/mkcert/ mkcert -install
19+
1720
sleep infinity

docker-compose.backstopjs.yaml

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#ddev-generated
22
services:
3-
# This is the service name used when running ddev commands accepting the
4-
# --service flag.
53
backstopjs:
6-
# This is the name of the container. It is recommended to follow the same
7-
# name convention used in the main docker-compose.yml file.
84
container_name: ddev-${DDEV_SITENAME}-backstopjs
95
build:
106
context: './backstopjsBuild'
@@ -19,21 +15,21 @@ services:
1915
# Add init to reap Chrome processes, as noted at
2016
# https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#running-puppeteer-in-docker
2117
init: true
22-
entrypoint: [ /entrypoint.sh ]
2318
shm_size: 1gb
24-
external_links:
25-
- web:${DDEV_SITENAME}.${DDEV_TLD}
2619
environment:
2720
DDEV_HOSTNAME: $DDEV_HOSTNAME
2821
NODE_EXTRA_CA_CERTS: /mnt/ddev-global-cache/mkcert/rootCA.pem
29-
# These labels ensure this service is discoverable by ddev.
3022
labels:
3123
com.ddev.site-name: ${DDEV_SITENAME}
3224
com.ddev.approot: ${DDEV_APPROOT}
25+
entrypoint: [ /entrypoint.sh ]
3326
volumes:
3427
- ../tests/backstopjs:/src/tests
3528
- .:/mnt/ddev_config:ro
3629
- ddev-global-cache:/mnt/ddev-global-cache
37-
networks:
38-
ddev_default: null
39-
default: null
30+
networks: [default, ddev_default]
31+
external_links:
32+
- ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
33+
web:
34+
links:
35+
- backstopjs

0 commit comments

Comments
 (0)