Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit ea18ce8

Browse files
author
Leo Gallucci
committed
Scenario make has startup issues
Scenario make has startup issues Switch to dist: bionic Switch to xenial Pin nginx image docker-compose issue .env -> .menv Debugging Travis issues New Docker setup
1 parent 90b3418 commit ea18ce8

File tree

7 files changed

+48
-37
lines changed

7 files changed

+48
-37
lines changed

.env renamed to .menv

File renamed without changes.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ python:
1010
sudo: required
1111

1212
os: linux
13-
dist: trusty
13+
dist: xenial
1414

1515
services:
1616
- docker

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ endif
2828

2929
default: compose
3030

31-
get: .env
31+
get: .menv
3232

33-
.env:
34-
wget -nv "${GIT_BASE_URL}/${GIT_TAG_OR_BRANCH}/.env"
33+
.menv:
34+
wget -nv "${GIT_BASE_URL}/${GIT_TAG_OR_BRANCH}/.menv"
3535

36-
include .env
36+
include .menv
3737

3838
ECHOERR=sh -c 'awk " BEGIN { print \"-- ERROR: $$1\" > \"/dev/fd/2\" }"' ECHOERR
3939
# TODO: Output warning in color: yellow
@@ -149,10 +149,10 @@ seeff:
149149
env:
150150
env
151151

152-
basic_reqs: docker-compose-tests.yml .env mk mk/wait.sh mk/move.sh docker docker-compose
152+
basic_reqs: docker-compose-tests.yml .menv mk mk/wait.sh mk/move.sh docker docker-compose
153153

154154
# Gather all requisites
155-
setup: .env basic_reqs mk/install_vnc.sh mk/vnc_cask.rb mk/see.sh mk/install_wmctrl.sh warn_vncviewer warn_wmctrl pull
155+
setup: .menv basic_reqs mk/install_vnc.sh mk/vnc_cask.rb mk/see.sh mk/install_wmctrl.sh warn_vncviewer warn_wmctrl pull
156156
@echo "Requirements checked."
157157

158158
cleanup:

docs/make.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ To update latest version of this docker image either `docker pull elgalu/seleniu
5555

5656
make pull
5757

58-
Every now and then you will want to upgrade the script files [.env](../.env), [docker-compose.yml][], [mk/](../mk) and so on.
58+
Every now and then you will want to upgrade the script files [.menv](../.menv), [docker-compose.yml][], [mk/](../mk) and so on.
5959
But given the upgrades are destructive is better to git clone this repository and do `git pull` from time to time.
6060
If you make changes to these config files locally git will advise how to merge latest changes and you will be safe of losing your customizations.
6161

test/before_install_docker_linux

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
set -xe
66

77
# cleanup
8-
sudo service docker stop || true
9-
sudo rm -f /etc/apt/sources.list.d/docker.list
10-
sudo rm -f /usr/lib/systemd/system/docker.service
11-
sudo apt -qqy purge lxc-docker || true
12-
sudo apt -qqy purge docker-engine || true
13-
sudo /etc/init.d/apparmor stop || true
14-
sudo rm -rf /var/lib/docker /dev/mapper/docker* /usr/bin/docker /run/docker /etc/docker || true
15-
sudo rm -rf /etc/apt/sources.list.d/docker* /etc/default/docker /etc/init.d/docker /etc/apparmor.d/cache/docker || true
16-
sudo rm -rf /etc/apparmor.d/docker /etc/bash_completion.d/docker /var/log/upstart/docker* || true
17-
sudo rm -rf /var/lib/apt/lists/*docker* /var/lib/dpkg/info/*docker* /dev/disk/by-id/*docker* || true
18-
sudo rm -rf /var/cache/apt/archives/docker* || true
19-
20-
sudo chown -R ${USER} /home/travis/.gnupg || true
8+
# sudo service docker stop || true
9+
# sudo rm -f /etc/apt/sources.list.d/docker.list
10+
# sudo rm -f /usr/lib/systemd/system/docker.service
11+
# sudo apt -qqy purge lxc-docker || true
12+
# sudo apt -qqy purge docker-engine || true
13+
# sudo /etc/init.d/apparmor stop || true
14+
# sudo rm -rf /var/lib/docker /dev/mapper/docker* /usr/bin/docker /run/docker /etc/docker || true
15+
# sudo rm -rf /etc/apt/sources.list.d/docker* /etc/default/docker /etc/init.d/docker /etc/apparmor.d/cache/docker || true
16+
# sudo rm -rf /etc/apparmor.d/docker /etc/bash_completion.d/docker /var/log/upstart/docker* || true
17+
# sudo rm -rf /var/lib/apt/lists/*docker* /var/lib/dpkg/info/*docker* /dev/disk/by-id/*docker* || true
18+
# sudo rm -rf /var/cache/apt/archives/docker* || true
19+
# sudo chown -R ${USER} /home/travis/.gnupg || true
2120

2221
# GPG servers aren't too reliable (especially in out test builds)
2322
# so fallback servers are needed
@@ -39,21 +38,29 @@ for key in \
3938
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
4039
done
4140

42-
# install
43-
CODE_NAME=$(lsb_release -sc) #e.g. trusty
44-
[ "${CODE_NAME}" == "" ] && CODE_NAME=trusty
45-
sudo sh -c "echo 'deb [arch=amd64] https://download.docker.com/linux/ubuntu ${CODE_NAME} stable' >> /etc/apt/sources.list.d/docker.list"
46-
# sed -i.bak '/docker/d' /etc/apt/sources.list.d/docker.list
47-
sudo apt -qqy update
48-
sudo apt -qqy install apt-transport-https ca-certificates
49-
50-
sudo apt-cache policy docker-engine || true
51-
sudo apt -qqy install linux-image-extra-$(uname -r)
52-
sudo apt -qqy install apparmor
53-
sudo /etc/init.d/apparmor start || true
5441
export DEBCONF_NONINTERACTIVE_SEEN=true
42+
43+
# install docker (<=2018)
44+
# CODE_NAME=$(lsb_release -sc) #e.g. trusty
45+
# [ "${CODE_NAME}" == "" ] && CODE_NAME=trusty
46+
# sudo sh -c "echo 'deb [arch=amd64] https://download.docker.com/linux/ubuntu ${CODE_NAME} stable' >> /etc/apt/sources.list.d/docker.list"
47+
# # sed -i.bak '/docker/d' /etc/apt/sources.list.d/docker.list
48+
# sudo apt -qqy update
49+
# sudo apt -qqy install apt-transport-https ca-certificates
50+
51+
# sudo apt-cache policy docker-engine || true
52+
# sudo apt -qqy install linux-image-extra-$(uname -r)
53+
# sudo apt -qqy install apparmor
54+
# sudo /etc/init.d/apparmor start || true
5555
# sudo apt -qqy install docker-engine
56-
sudo apt -qyy install docker-ce
56+
# sudo apt -qyy install docker-ce
57+
58+
# install docker (2019)
59+
# https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
60+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
61+
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
62+
sudo apt -qqy update
63+
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
5764

5865
# if [ "${DOCKER_VERSION}" != "stable" ]; then
5966
# # wget -nv -O docker.tgz "https://github.com/docker/docker/archive/v${DOCKER_VERSION}.tar.gz"

test/compose-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ sleep ${SLEEP_TIME}
3939

4040
# Wait then show errors, if any
4141
if ! docker exec grid_hub_1 wait_all_done ${WAIT_ALL_DONE}; then
42-
docker exec grid_hub_1 errors || true
42+
docker exec grid_hub_1 errors || docker ps -a
4343
docker-compose -f ${COMPOSE_FILE} -p grid logs hub
44-
die "Failed to start the Hub"
44+
die "$0 Failed to start the Hub"
4545
fi
4646

4747
for i in $(seq 1 ${NUM_NODES}); do

test/script_scenario_basic

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ docker rm basic_webserver || true
117117
# Let's bind to all host interfaces in case the host has ufw enabled
118118
docker run -d -t --name=basic_webserver \
119119
-p 0.0.0.0:${BASIC_WEB_SERVER_PORT}:80 \
120-
nginx
120+
nginx:1.15.11
121121

122122
docker attach basic_webserver &
123123

@@ -127,6 +127,10 @@ while ! curl -s "http://localhost:${BASIC_WEB_SERVER_PORT}"; do
127127
sleep 0.2
128128
done
129129

130+
# sudo vim /etc/default/ufw
131+
# DEFAULT_FORWARD_POLICY="ACCEPT"
132+
# sudo ufw reload
133+
# sudo iptables -I INPUT -i docker0 -j ACCEPT
130134
docker exec grid curl d.host.loc.dev:${BASIC_WEB_SERVER_PORT}
131135
docker exec grid curl host.docker:${BASIC_WEB_SERVER_PORT}
132136

0 commit comments

Comments
 (0)