Merge "Fix: tools/airship permissions and directories issues"
This commit is contained in:
commit
bf4e245787
|
@ -191,12 +191,14 @@ installing git, installing docker, clone sevral repos etc.
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
mkdir certs
|
||||||
./tools/airship promenade generate-certs -o /target/certs /target/collect/*.yaml
|
./tools/airship promenade generate-certs -o /target/certs /target/collect/*.yaml
|
||||||
|
|
||||||
3. Generate genesis.sh scipt
|
3. Generate genesis.sh scipt
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
|
mkdir bundle
|
||||||
./tools/airship promenade build-all -o /target/bundle /target/collect/*.yaml /target/certs/*.yaml
|
./tools/airship promenade build-all -o /target/bundle /target/collect/*.yaml /target/certs/*.yaml
|
||||||
|
|
||||||
4. Execute the genesis.sh script
|
4. Execute the genesis.sh script
|
||||||
|
|
|
@ -42,6 +42,8 @@ EOF
|
||||||
|
|
||||||
REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ >/dev/null 2>&1 && pwd )"
|
REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ >/dev/null 2>&1 && pwd )"
|
||||||
|
|
||||||
|
USER=$(id -u)
|
||||||
|
GROUP=$(id -g)
|
||||||
|
|
||||||
# Key/value lookups from manifests
|
# Key/value lookups from manifests
|
||||||
manifests_lookup(){
|
manifests_lookup(){
|
||||||
|
@ -110,6 +112,7 @@ pegleg() {
|
||||||
versions_lookup "['data']['images']['ucp']['pegleg']['pegleg']"
|
versions_lookup "['data']['images']['ucp']['pegleg']['pegleg']"
|
||||||
|
|
||||||
docker run --rm --net=host $TERM_OPTS \
|
docker run --rm --net=host $TERM_OPTS \
|
||||||
|
-u "${USER}:${GROUP}" \
|
||||||
-w /target \
|
-w /target \
|
||||||
-v $(pwd):/target \
|
-v $(pwd):/target \
|
||||||
-v ${HOME}/.ssh:/target/.ssh \
|
-v ${HOME}/.ssh:/target/.ssh \
|
||||||
|
@ -132,6 +135,7 @@ NO_PROXY=${NO_PROXY:-}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
docker run --rm --net=host $TERM_OPTS \
|
docker run --rm --net=host $TERM_OPTS \
|
||||||
|
-u "${USER}:${GROUP}" \
|
||||||
-w /target \
|
-w /target \
|
||||||
-v $(pwd):/target \
|
-v $(pwd):/target \
|
||||||
--env-file $ENV_FILE \
|
--env-file $ENV_FILE \
|
||||||
|
@ -144,6 +148,7 @@ shipyard() {
|
||||||
|
|
||||||
SHIPYARD_IMAGE=$RESULT
|
SHIPYARD_IMAGE=$RESULT
|
||||||
docker run --rm --net=host $TERM_OPTS \
|
docker run --rm --net=host $TERM_OPTS \
|
||||||
|
-u "${USER}:${GROUP}" \
|
||||||
-w /target \
|
-w /target \
|
||||||
-v $(pwd):/target \
|
-v $(pwd):/target \
|
||||||
--env-file $ENV_FILE \
|
--env-file $ENV_FILE \
|
||||||
|
|
Loading…
Reference in New Issue