firethorn

changeset 4254:c18b2033316a

Updating notes after the merge
author Dave Morris <dmr@roe.ac.uk>
date Fri Jun 07 04:58:12 2019 +0100 (2019-06-07)
parents e59ced69f8e5
children 1e066fd64fd9
files doc/notes/zrq/20190601-01-hg-merge.txt doc/notes/zrq/20190601-02-merge-tests.txt docker/fedora/Dockerfile
line diff
     1.1 --- a/doc/notes/zrq/20190601-01-hg-merge.txt	Fri Jun 07 04:40:54 2019 +0100
     1.2 +++ b/doc/notes/zrq/20190601-01-hg-merge.txt	Fri Jun 07 04:58:12 2019 +0100
     1.3 @@ -101,7 +101,6 @@
     1.4      branch=2.1.31-stv-cleanup
     1.5      branch=2.1.32-zrq-thread-pools
     1.6  
     1.7 -
     1.8  # -----------------------------------------------------
     1.9  # Run our builder.
    1.10  #[user@virtual]
     2.1 --- a/doc/notes/zrq/20190601-02-merge-tests.txt	Fri Jun 07 04:40:54 2019 +0100
     2.2 +++ b/doc/notes/zrq/20190601-02-merge-tests.txt	Fri Jun 07 04:58:12 2019 +0100
     2.3 @@ -62,46 +62,48 @@
     2.4  
     2.5  EOF
     2.6  
     2.7 +
     2.8  # -----------------------------------------------------
     2.9 -# Link our compose config.
    2.10 +# Determine our location.
    2.11  #[user@builder]
    2.12  
    2.13 -    ln -sf "${FIRETHORN_HOME:?}/chain.properties" "${FIRETHORN_HOME:?}/.env"
    2.14 +    # 'local' if VM is inside UoE
    2.15 +    # 'remote' if VM is at outside UoE
    2.16 +    # TODO Change these to 'internal' and 'external'
    2.17 +
    2.18 +    external=$(curl -4 --silent 'http://icanhazip.com/')
    2.19 +
    2.20 +    EDINBURGH='129.215.*'
    2.21 +
    2.22 +    if [[ ${external:?} == ${EDINBURGH} ]]
    2.23 +    then
    2.24 +        echo "Address [${external:?}] is in Edinburgh"
    2.25 +        #location=internal
    2.26 +        location=local
    2.27 +    else
    2.28 +        echo "Address [${external:?}] is not in Edinburgh"
    2.29 +        #location=external
    2.30 +        location=remote
    2.31 +    fi
    2.32 +
    2.33  
    2.34  # -----------------------------------------------------
    2.35 -# Start our test containers ...
    2.36 +# Link our compose config and start our test containers ...
    2.37  #[user@builder]
    2.38  
    2.39 +    # Check the env file is linked !!
    2.40 +
    2.41      pushd "${FIRETHORN_HOME:?}"
    2.42  
    2.43 -#
    2.44 -# Choose one.
    2.45 -# 'local' if VM is inside UoE
    2.46 -# 'remote' if VM is at outside UoE
    2.47 -# TODO Change these to 'internal' and 'external'
    2.48 -
    2.49 -        external=$(curl -4 --silent 'http://icanhazip.com/')
    2.50 -
    2.51 -        EDINBURGH='129.215.*'
    2.52 -
    2.53 -        if [[ ${external:?} == ${EDINBURGH} ]]
    2.54 -        then
    2.55 -            echo "Address [${external:?}] is in Edinburgh"
    2.56 -            #location=internal
    2.57 -            location=local
    2.58 -        else
    2.59 -            echo "Address [${external:?}] is not in Edinburgh"
    2.60 -            #location=external
    2.61 -            location=remote
    2.62 -        fi
    2.63 -
    2.64 -        # Check the env file is linked !!
    2.65 +        ln -sf 'chain.properties' '.env'
    2.66  
    2.67          docker-compose \
    2.68              --file "${FIRETHORN_CODE:?}/docker/compose/tests/baryptera/baryptera-${location:?}.yml" \
    2.69              run \
    2.70                  angela
    2.71  
    2.72 +
    2.73 +
    2.74  # -----------------------------------------------------
    2.75  # -----------------------------------------------------
    2.76  # Separate shell on the host VM, locate the logs volume and tail the firethorn log.
     3.1 --- a/docker/fedora/Dockerfile	Fri Jun 07 04:40:54 2019 +0100
     3.2 +++ b/docker/fedora/Dockerfile	Fri Jun 07 04:58:12 2019 +0100
     3.3 @@ -18,6 +18,9 @@
     3.4  # FROM latest (fedora:29)
     3.5  # https://github.com/docker-library/repo-info/blob/master/repos/fedora/tag-details.md#fedoralatest
     3.6  # FROM fedora@sha256:2a60898a6dd7da9964b0c59fedcf652e24bfff04142e5488f793c9e8156afd33
     3.7 +
     3.8 +# Problems with OGSA-DAI webapp meant we had to revert back to fedora:28.
     3.9 +# FROM fedora:28
    3.10  FROM fedora@sha256:7ae08e5637170eb47c01e315b6e64e0d48c6200d2942c695d0bee61b38c65b39
    3.11  
    3.12  MAINTAINER [Dave Morris <docker-admin@metagrid.co.uk>]