gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 23:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #913 from openziti/issue-912_keep-files-containerized

Browse Source 
Keep certain files in the container
This commit is contained in:
Geoff Berl
2022-12-06 11:46:52 -05:00
committed by GitHub
parent 8af3827714 2c9e8b1b4e
commit aba334571c
14 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstart/README.md
+1 -1
View File
@@ -41,7 +41,7 @@ the scripts in these folders before running them.
## Express
By far the easiest way to establish an environment quickly is to simply run the express install script
found at [./quickstart/local/express/express-dev-env.sh]().
found at [./quickstart/docker/image/ziti-cli-functions.sh]().
### What It Does
quickstart/docker/README.md
+1 -1
View File
@@ -22,7 +22,7 @@ Build Docker Image For Publication
1. build the docker image: `docker build image -t openziti/quickstart`
1. exec into a container and make sure it's the version you expect: `docker run --rm -it openziti/quickstart ziti --version`
1. cleanup: `rm ziti-*tar.gz; rm -rf ziti-bin`
2.
Push Docker Image to dockerhub
------------------
1. `source ./image/ziti-cli-functions.sh`
quickstart/docker/attach.container.to.compose.sh
+1 -1
View File
@@ -1 +1 @@
docker run -v docker_ziti-fs:/openziti --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
docker run -v docker_ziti-fs:/persistent --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
quickstart/docker/blue.nw.attach.sh
+1 -1
View File
@@ -1 +1 @@
docker run --cap-add=NET_ADMIN --device /dev/net/tun --name ziti-tunneler-blue --user root --network docker_zitiblue -v docker_ziti-fs:/openziti --rm -it openziti/quickstart /bin/bash
docker run --cap-add=NET_ADMIN --device /dev/net/tun --name ziti-tunneler-blue --user root --network docker_zitiblue -v docker_ziti-fs:/persistent --rm -it openziti/quickstart /bin/bash
quickstart/docker/buildLocalDev.sh
+1 -1
View File
@@ -54,7 +54,7 @@ if [ -d "${ZITI_DOCKER_ROOT}/image/ziti.ignore" ]; then
rm -rf "${ZITI_DOCKER_ROOT}/image/ziti.ignore"
fi
echo "Ziti Version: $(docker run --rm -it openziti/quickstart:dev /openziti/ziti-bin/ziti --version)"
echo "Ziti Version: $(docker run --rm -it openziti/quickstart:dev /var/openziti/ziti-bin/ziti --version)"
vers="$(echo "${ZITI_BINARIES_VERSION}" | cut -c 2-100)"
docker tag "openziti/quickstart:dev" "openziti/quickstart:dev"
quickstart/docker/docker-compose.yml
+18 -18
View File
@@ -17,9 +17,9 @@ services:
aliases:
- ziti-edge-controller
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint:
- "/openziti/scripts/run-controller.sh"
- "/var/openziti/scripts/run-controller.sh"
ziti-controller-init-container:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -38,11 +38,11 @@ services:
aliases:
- ziti-edge-controller-init-container
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint:
- "/openziti/scripts/run-with-ziti-cli.sh"
- "/var/openziti/scripts/run-with-ziti-cli.sh"
command:
- "/openziti/scripts/access-control.sh"
- "/var/openziti/scripts/access-control.sh"
ziti-edge-router:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -59,9 +59,9 @@ services:
- zitiblue
- zitired
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh edge"
command: "/var/openziti/scripts/run-router.sh edge"
ziti-edge-router-wss:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -79,9 +79,9 @@ services:
- zitiblue
- zitired
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh wss"
command: "/var/openziti/scripts/run-router.sh wss"
ziti-fabric-router-br:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -97,9 +97,9 @@ services:
- zitiblue
- zitired
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh fabric"
command: "/var/openziti/scripts/run-router.sh fabric"
ziti-private-red:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -114,9 +114,9 @@ services:
networks:
- zitired
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh private"
command: "/var/openziti/scripts/run-router.sh private"
ziti-private-blue:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -131,9 +131,9 @@ services:
networks:
- zitiblue
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh private"
command: "/var/openziti/scripts/run-router.sh private"
web-test-blue:
image: crccheck/hello-world
@@ -149,14 +149,14 @@ services:
ziti-console:
image: openziti/zac
environment:
- ZAC_SERVER_CERT_CHAIN=/openziti/pki/ziti-controller-intermediate/certs/ziti-controller-server.cert
- ZAC_SERVER_KEY=/openziti/pki/ziti-controller-intermediate/keys/ziti-controller-server.key
- ZAC_SERVER_CERT_CHAIN=/persistent/pki/ziti-controller-intermediate/certs/ziti-controller-server.cert
- ZAC_SERVER_KEY=/persistent/pki/ziti-controller-intermediate/keys/ziti-controller-server.key
ports:
- "1408:1408"
- "8443:8443"
working_dir: /usr/src/app
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
networks:
- zitiblue
quickstart/docker/image/Dockerfile
+7 -9
View File
@@ -4,21 +4,19 @@ RUN apt update && \
apt install jq curl netcat-openbsd vim inetutils-ping net-tools lsof -y
RUN useradd -ms /bin/bash ziti && \
mkdir /openziti && chown ziti:ziti /openziti && \
mkdir /openziti/scripts && chown ziti:ziti /openziti/scripts && \
mkdir /openziti/shared && chown ziti:ziti /openziti/shared
mkdir /persistent && chown ziti:ziti /persistent && \
mkdir /persistent/scripts && chown ziti:ziti /persistent/scripts
USER ziti
WORKDIR /openziti
WORKDIR /persistent
ENV ZITI_HOME=/openziti
ENV ZITI_BIN_DIR="${ZITI_HOME}/ziti-bin"
ENV ZITI_HOME=/persistent
ENV ZITI_SHARED="${ZITI_HOME}/shared"
ENV ZITI_SCRIPTS="${ZITI_HOME}/scripts"
ENV ENV_FILE="${ZITI_HOME}/ziti.env"
ENV ZITI_NETWORK=ziti
RUN mkdir -p "${ZITI_SCRIPTS}"
# Don't put these paths on shared volume in docker-compose deployment (https://github.com/openziti/ziti/issues/912)
ENV ZITI_BIN_DIR=/var/openziti/ziti-bin
ENV ZITI_SCRIPTS=/var/openziti/scripts
# copy the ziti binaries to a directory already on the path
COPY --chown=ziti ziti.ignore "${ZITI_BIN_DIR}"
quickstart/docker/image/TestDockerfile
+9 -10
View File
@@ -4,20 +4,19 @@ RUN apt update && \
apt install jq curl vim psmisc -y
RUN useradd -ms /bin/bash ziti && \
mkdir /openziti && chown ziti:ziti /openziti && \
mkdir /openziti/scripts && chown ziti:ziti /openziti/scripts && \
mkdir /openziti/shared && chown ziti:ziti /openziti/shared
mkdir /persistent && chown ziti:ziti /persistent && \
mkdir /persistent/scripts && chown ziti:ziti /persistent/scripts
USER ziti
WORKDIR /openziti
WORKDIR /persistent
ENV ZITI_HOME=/openziti
ENV ZITI_BIN_DIR="${ZITI_HOME}/ziti-bin"
ENV ZITI_SCRIPTS="${ZITI_HOME}/scripts"
ENV ZITI_HOME=/persistent
ENV ZITI_SHARED="${ZITI_HOME}/shared"
ENV ENV_FILE="${ZITI_HOME}/ziti.env"
ENV ZITI_NETWORK=localhost
RUN mkdir -p "${ZITI_SCRIPTS}"
ENV ZITI_NETWORK=ziti
# Don't put these paths on shared volume in docker-compose deployment (https://github.com/openziti/ziti/issues/912)
ENV ZITI_BIN_DIR=/var/openziti/ziti-bin
ENV ZITI_SCRIPTS=/var/openziti/scripts
COPY --chown=ziti ziti.ignore "${ZITI_BIN_DIR}"
COPY --chown=ziti ziti-cli-functions.sh "${ZITI_SCRIPTS}/"
quickstart/docker/image/dockerTestEntrypoint.sh
+1 -1
View File
@@ -6,4 +6,4 @@ fi
touch runonce
source "${ZITI_SCRIPTS}/ziti-cli-functions.sh"
expressInstall "${ZITI_NETWORK}"
expressInstall "localhost"
quickstart/docker/image/run-controller.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
ziti_controller_cfg='/openziti/ziti-edge-controller.yaml'
ziti_controller_cfg="${ZITI_HOME}/ziti-edge-controller.yaml"
export ZITI_CONTROLLER_RAWNAME=ziti-controller
export ZITI_EDGE_CONTROLLER_RAWNAME=ziti-edge-controller
quickstart/docker/image/run-with-ziti-cli.sh
+6 -6
View File
@@ -15,15 +15,15 @@ if [[ ! -f $1 ]]; then
fi
# Should we execute?
initFile="/openziti/access-control.init"
initFile="${ZITI_HOME}/access-control.init"
if [[ -f "${initFile}" ]]; then
echo " "
echo "*****************************************************"
echo " docker-compose init file has been detected"
echo " the initialization of the docker-compose environment has already happened"
echo " if you wish to allow this volume to be re-initialized, delete the file"
echo "*****************************************************************"
echo " docker-compose init file has been detected, the initialization "
echo " of the docker-compose environment has already happened. If you "
echo " wish to allow this volume to be re-initialized, delete the file "
echo " located at ${initFile}"
echo "*****************************************************"
echo "*****************************************************************"
echo " "
exit 0
fi
quickstart/docker/red.nw.attach.sh
+1 -1
View File
@@ -1 +1 @@
docker run --cap-add=NET_ADMIN --device /dev/net/tun --name ziti-tunneler-red --user root --network docker_zitired -v docker_ziti-fs:/openziti --rm -it openziti/quickstart /bin/bash
docker run --cap-add=NET_ADMIN --device /dev/net/tun --name ziti-tunneler-red --user root --network docker_zitired -v docker_ziti-fs:/persistent --rm -it openziti/quickstart /bin/bash
quickstart/docker/simplified-docker-compose.yml
+10 -10
View File
@@ -14,9 +14,9 @@ services:
aliases:
- ziti-edge-controller
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint:
- "/openziti/scripts/run-controller.sh"
- "/var/openziti/scripts/run-controller.sh"
ziti-controller-init-container:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -35,11 +35,11 @@ services:
aliases:
- ziti-edge-controller-init-container
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint:
- "/openziti/scripts/run-with-ziti-cli.sh"
- "/var/openziti/scripts/run-with-ziti-cli.sh"
command:
- "/openziti/scripts/access-control.sh"
- "/var/openziti/scripts/access-control.sh"
ziti-edge-router:
image: "${ZITI_IMAGE}:${ZITI_VERSION}"
@@ -54,22 +54,22 @@ services:
- zitiblue
- zitired
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
entrypoint: /bin/bash
command: "/openziti/scripts/run-router.sh edge"
command: "/var/openziti/scripts/run-router.sh edge"
ziti-console:
image: openziti/zac
environment:
- ZAC_SERVER_CERT_CHAIN=/openziti/pki/ziti-controller-intermediate/certs/ziti-controller-server.cert
- ZAC_SERVER_KEY=/openziti/pki/ziti-controller-intermediate/keys/ziti-controller-server.key
- ZAC_SERVER_CERT_CHAIN=/persistent/pki/ziti-controller-intermediate/certs/ziti-controller-server.cert
- ZAC_SERVER_KEY=/persistent/pki/ziti-controller-intermediate/keys/ziti-controller-server.key
depends_on:
- ziti-controller
ports:
- "1408:1408"
- "8443:8443"
volumes:
- ziti-fs:/openziti
- ziti-fs:/persistent
networks:
- zitiblue
quickstart/test/quickstart_test.go
+5 -5
View File
@@ -220,13 +220,13 @@ func TestQuickStartEnvFile(t *testing.T) {
expectedValues := []string{
"export ZITI_EDGE_ROUTER_RAWNAME=\"localhost-edge-router\"",
"export ZITI_EDGE_CONTROLLER_RAWNAME=\"localhost\"",
"export ZITI_HOME_OS_SPECIFIC=\"/openziti\"",
"export ZITI_HOME=\"/openziti\"",
"export ZITI_BIN_DIR=\"/openziti/ziti-bin\"",
"export ZITI_HOME_OS_SPECIFIC=\"/persistent\"",
"export ZITI_HOME=\"/persistent\"",
"export ZITI_BIN_DIR=\"/var/openziti/ziti-bin\"",
"export ZITI_EDGE_CTRL_ADVERTISED=\"localhost:1280\"",
"export ZITI_USER=\"admin\"",
"export ZITI_PWD=\"admin\"",
"export ZITI_PKI_OS_SPECIFIC=\"/openziti/pki\"",
"export ZITI_PKI_OS_SPECIFIC=\"/persistent/pki\"",
"export ZITI_EDGE_CONTROLLER_ROOTCA_NAME=\"localhost-root-ca\"",
"export ZITI_EDGE_CONTROLLER_INTERMEDIATE_NAME=\"localhost-intermediate\"",
}
@@ -251,7 +251,7 @@ func TestQuickStartEnvFile(t *testing.T) {
if err != nil {
fmt.Printf("Error: %s\n", output)
}
cpString := containerId + ":/openziti/localhost.env"
cpString := containerId + ":/persistent/localhost.env"
cmd := exec.Command("docker", "cp", cpString, ".")
err = cmd.Run()
if err != nil {