Skip to content

Commit

Permalink
fix docs ( complete the container name with univention namespace )
Browse files Browse the repository at this point in the history
  • Loading branch information
GinoHarlos committed Aug 11, 2024
1 parent 8c94f0c commit 1ec7d94
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 72 deletions.
28 changes: 14 additions & 14 deletions docs/README.ADVANCED.BUILD.PRE.INSTALLED.ROLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ docker image inspect --format '{{ index .Config.Labels "org.label-schema.docker.
## Build a deployment container image with docker and pre installed role ```( optionally with time )```
```bash
declare -A roles[master]="primary directory node" roles[slave]="replica directory node" roles[backup]="backup directory node" roles[member]="managed node"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; \
for role in ${!roles[*]}; do \
time docker build \
--build-arg role="${role}" \
Expand All @@ -61,14 +61,14 @@ for role in ${!roles[*]}; do \
--file ./pre.installed.role.Dockerfile . ; \
done
...
Successfully tagged univention-corporate-server-${role}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server-${role}:latest
Successfully tagged univention/univention-corporate-server-${role}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server-${role}:latest
...
```
### Container image build with docker, pre installed role and as Active Directory-compatible Domain Controller ```( experimental )```
```bash
declare -A roles[master]="primary directory node" roles[slave]="replica directory node" roles[backup]="backup directory node" roles[member]="managed node"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; APPS="samba4"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; APPS="samba4"; \
for role in ${!roles[*]}; do \
apps=$([[ ${role} =~ member ]] && echo -e '' || echo -e '-ad-dc'); \
time docker build \
Expand All @@ -85,18 +85,18 @@ for role in ${!roles[*]}; do \
--file ./pre.installed.role.Dockerfile . ; \
done
...
Successfully tagged univention-corporate-server-${role}${apps}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server-${role}${apps}:latest
Successfully tagged univention/univention-corporate-server-${role}${apps}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server-${role}${apps}:latest
...
```
### Inspect the univention-corporate-server-${role} container image size
```bash
docker images --format 'table {{ .Repository }}\t\t{{ .Size }}' univention-corporate-server*latest
docker images --format 'table {{ .Repository }}\t\t{{ .Size }}' univention/univention-corporate-server*latest
```
## Build a deployment container image with podman and pre installed role ```( optionally with time )```
```bash
declare -A roles[master]="primary directory node" roles[slave]="replica directory node" roles[backup]="backup directory node" roles[member]="managed node"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; \
for role in ${!roles[*]}; do \
time podman build \
--format docker \
Expand All @@ -112,14 +112,14 @@ for role in ${!roles[*]}; do \
--file ./pre.installed.role.Dockerfile . ; \
done
...
Successfully tagged univention-corporate-server-${role}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server-${role}:latest
Successfully tagged univention/univention-corporate-server-${role}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server-${role}:latest
...
```
### Container image build with podman, pre installed role and as Active Directory-compatible Domain Controller ```( experimental )```
```bash
declare -A roles[master]="primary directory node" roles[slave]="replica directory node" roles[backup]="backup directory node" roles[member]="managed node"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; APPS="samba4"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; APPS="samba4"; \
for role in ${!roles[*]}; do \
apps=$([[ ${role} =~ member ]] && echo -e '' || echo -e '-ad-dc'); \
time podman build \
Expand All @@ -137,11 +137,11 @@ for role in ${!roles[*]}; do \
--file ./pre.installed.role.Dockerfile . ; \
done
...
Successfully tagged univention-corporate-server-${role}${apps}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server-${role}${apps}:latest
Successfully tagged univention/univention-corporate-server-${role}${apps}:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server-${role}${apps}:latest
...
```
### Inspect the univention-corporate-server-${role} container image size
```bash
podman images --format 'table {{ .Repository }}\t\t{{ .Size }}' univention-corporate-server*latest
podman images --format 'table {{ .Repository }}\t\t{{ .Size }}' univention/univention-corporate-server*latest
```
72 changes: 36 additions & 36 deletions docs/README.ADVANCED.BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ STDOUT ( timeing )
```
## Build a deployment container image with different repository server using docker build ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="test"; UPDATES="updates-test.software-univention.de"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="test"; UPDATES="updates-test.software-univention.de"; \
time docker build \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg UPDATES=${UPDATES} \
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag univention-corporate-server:${TAG} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention-corporate-server:test
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention/univention-corporate-server:test
...
real 6m57,659s
user 0m1,098s
Expand All @@ -36,23 +36,23 @@ sys 0m0,901s
```
### Inspect the univention-corporate-server container image
```bash
docker image inspect univention-corporate-server:test
docker image inspect univention/univention-corporate-server:test
```
## Build a deployment container image with different repository server using podman build ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="test"; UPDATES="updates-test.software-univention.de"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="test"; UPDATES="updates-test.software-univention.de"; \
time podman build \
--format docker \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg UPDATES=${UPDATES} \
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag univention-corporate-server:${TAG} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention-corporate-server:test
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention/univention-corporate-server:test
...
real 6m58,351s
user 0m0,102s
Expand All @@ -61,23 +61,23 @@ sys 0m0,097s
```
### Inspect the univention-corporate-server container image
```bash
podman image inspect univention-corporate-server:test
podman image inspect univention/univention-corporate-server:test
```
## Build a deployment container image as a slimify variant using docker build ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="test"; SLIM="slim"; UPDATES="updates-test.software-univention.de"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="test"; SLIM="slim"; UPDATES="updates-test.software-univention.de"; \
time docker build \
--build-arg SLIM=${SLIM} \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg UPDATES=${UPDATES} \
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM} \
--tag univention-corporate-server:${TAG}-${SLIM} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM} \
--tag ${IMAGE}:${TAG}-${SLIM} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM}
Successfully tagged univention-corporate-server:test-slim
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM}
Successfully tagged univention/univention-corporate-server:test-slim
...
real 6m42,444s
user 0m0,999s
Expand All @@ -86,11 +86,11 @@ sys 0m0,819s
```
### Inspect the univention-corporate-server container image
```bash
docker image inspect univention-corporate-server:test-slim
docker image inspect univention/univention-corporate-server:test-slim
```
## Build a deployment container image as a slimify variant using podman build ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="test"; SLIM="slim"; UPDATES="updates-test.software-univention.de"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="test"; SLIM="slim"; UPDATES="updates-test.software-univention.de"; \
time podman build \
--format docker \
--build-arg SLIM=${SLIM} \
Expand All @@ -99,11 +99,11 @@ MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="test"; SLIM
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM} \
--tag univention-corporate-server:${TAG}-${SLIM} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM} \
--tag ${IMAGE}:${TAG}-${SLIM} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM}
Successfully tagged univention-corporate-server:test-slim
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}-${SLIM}
Successfully tagged univention/univention-corporate-server:test-slim
...
real 7m2,239s
user 0m0,024s
Expand All @@ -112,22 +112,22 @@ sys 0m0,068s
```
### Inspect the univention-corporate-server container image
```bash
podman image inspect univention-corporate-server:test-slim
podman image inspect univention/univention-corporate-server:test-slim
```
## Build a deployment container image with the latest development version using docker build ```( optionally with time )```
```bash
MAJOR=0; MINOR=0; PATCH=0; IMAGE="univention-corporate-server"; TAG="devel"; UPDATES="updates-test.software-univention.de"; \
MAJOR=0; MINOR=0; PATCH=0; IMAGE="univention/univention-corporate-server"; TAG="devel"; UPDATES="updates-test.software-univention.de"; \
time docker build \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg UPDATES=${UPDATES} \
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag univention-corporate-server:${TAG} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention-corporate-server:devel
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention/univention-corporate-server:devel
...
real 6m58,719s
user 0m1,197s
Expand All @@ -136,23 +136,23 @@ sys 0m0,765s
```
### Inspect the univention-corporate-server container image
```bash
docker image inspect univention-corporate-server:devel
docker image inspect univention/univention-corporate-server:devel
```
## Build a deployment container image with the latest development version using podman build ```( optionally with time )```
```bash
MAJOR=0; MINOR=0; PATCH=0; IMAGE="univention-corporate-server"; TAG="devel"; UPDATES="updates-test.software-univention.de"; \
MAJOR=0; MINOR=0; PATCH=0; IMAGE="univention/univention-corporate-server"; TAG="devel"; UPDATES="updates-test.software-univention.de"; \
time podman build \
--format docker \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg UPDATES=${UPDATES} \
--build-arg MAJOR=${MAJOR} \
--build-arg MINOR=${MINOR} \
--build-arg PATCH=${PATCH} \
--tag univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag univention-corporate-server:${TAG} .
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH}-${TAG} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention-corporate-server:devel
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}-${TAG}
Successfully tagged univention/univention-corporate-server:devel
...
real 8m11,503s
user 0m0,125s
Expand All @@ -161,5 +161,5 @@ sys 0m0,137s
```
### Inspect the univention-corporate-server container image
```bash
podman image inspect univention-corporate-server:devel
podman image inspect univention/univention-corporate-server:devel
```
4 changes: 2 additions & 2 deletions docs/README.ADVANCED.EXAMPLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ NETWORK=ucs; FQDN=dc.${NETWORK}.example; CERT=rootCA.crt; SIGN=rootCA.key; PASS=
--env DEBUG=TRUE \
--env install='{"add-app":["samba4","cups"]}' \
$(echo --env certificates=\''{"root":{"certificate":{"crt":"'$(openssl x509 -outform PEM -in ${CERT} | awk '{ if( NF==1 ){ printf $0 } }')'"},"rsa":{"encryption":{"signkey":"'$(awk '{ if( NF==1 ){ printf $0 } }' ${SIGN})'","encrypted":'$(awk '/^Proc-Type/{ split($2,TYPE,","); if ( TYPE[2]=="ENCRYPTED" ) { printf "true" } }' ${SIGN})',"version":'$(awk '/^Proc-Type/{ split($2,TYPE,","); printf TYPE[1] }' ${SIGN})',"algorithm":"'$(awk '/^DEK-Info/{ split($2,DEK,","); printf DEK[1] }' ${SIGN})'","password":"'$(tr --delete '\n' < ${PASS})'","salt":"'$(awk '/^DEK-Info/{ split($2,DEK,","); printf DEK[2] }' ${SIGN})'"}}}}'\') \
univention-corporate-server
univention/univention-corporate-server
```

#### (option -- B) deploy ```HOSTNAME(dc) DOMAINNAME(ucs.example) CONTAINERNAME(dc.ucs.example)``` on ```NETWORK(ucs)``` with container security option ``` ( --privileg ) ``` for Docker in Docker ( dind ) and network file system ( NFS ) too
Expand All @@ -188,7 +188,7 @@ NETWORK=ucs; FQDN=dc.${NETWORK}.example; CERT=rootCA.crt; SIGN=rootCA.key; PASS=
--env DEBUG=TRUE \
--env install='{"add-app":["samba4","cups"]}' \
$(echo --env certificates=\''{"root":{"certificate":{"crt":"'$(openssl x509 -outform PEM -in ${CERT} | awk '{ if( NF==1 ){ printf $0 } }')'"},"rsa":{"encryption":{"signkey":"'$(awk '{ if( NF==1 ){ printf $0 } }' ${SIGN})'","encrypted":'$(awk '/^Proc-Type/{ split($2,TYPE,","); if ( TYPE[2]=="ENCRYPTED" ) { printf "true" } }' ${SIGN})',"version":'$(awk '/^Proc-Type/{ split($2,TYPE,","); printf TYPE[1] }' ${SIGN})',"algorithm":"'$(awk '/^DEK-Info/{ split($2,DEK,","); printf DEK[1] }' ${SIGN})'","password":"'$(tr --delete '\n' < ${PASS})'","salt":"'$(awk '/^DEK-Info/{ split($2,DEK,","); printf DEK[2] }' ${SIGN})'"}}}}'\') \
univention-corporate-server
univention/univention-corporate-server
```

#### follow deploying proccess with one or more of these commands ```(CTRL+C OR CTRL+D TO EXIT)```
Expand Down
8 changes: 4 additions & 4 deletions docs/README.BASIC.EXAMPLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ FQDN=dc.ucs.example; \
--restart unless-stopped \
--hostname ${FQDN} \
--name ${FQDN} \
univention-corporate-server
univention/univention-corporate-server
```
#### follow deploying proccess with one or more of these commands ```(CTRL+C OR CTRL+D TO EXIT)```
```bash
Expand Down Expand Up @@ -99,7 +99,7 @@ MASTER=dc.ucs.example; FQDN=s${MASTER}; \
--env dcpass=$(docker exec --tty ${MASTER} cat /dev/shm/univention-container-mode.secrets) \
--hostname ${FQDN} \
--name ${FQDN} \
univention-corporate-server
univention/univention-corporate-server
```
#### follow deploying proccess with one or more of these commands ```(CTRL+C OR CTRL+D TO EXIT)```
```bash
Expand Down Expand Up @@ -161,7 +161,7 @@ MASTER=dc.ucs.example; FQDN=b${MASTER}; \
--env dcpass=$(docker exec --tty ${MASTER} cat /dev/shm/univention-container-mode.secrets) \
--hostname ${FQDN} \
--name ${FQDN} \
univention-corporate-server
univention/univention-corporate-server
```
#### follow deploying proccess with one or more of these commands ```(CTRL+C OR CTRL+D TO EXIT)```
```bash
Expand Down Expand Up @@ -223,7 +223,7 @@ MASTER=dc.ucs.example; FQDN=m${MASTER}; \
--env dcpass=$(docker exec --tty ${MASTER} cat /dev/shm/univention-container-mode.secrets) \
--hostname ${FQDN} \
--name ${FQDN} \
univention-corporate-server
univention/univention-corporate-server
```
#### follow deploying proccess with one or more of these commands ```(CTRL+C OR CTRL+D TO EXIT)```
```bash
Expand Down
16 changes: 8 additions & 8 deletions docs/README.BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ STDOUT ( timeing )
```
## Build a deployment container image with docker ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; \
time docker build \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--build-arg MAJOR=${MAJOR} \
Expand All @@ -25,8 +25,8 @@ MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server:latest
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server:latest
...
real 6m57,659s
user 0m1,098s
Expand All @@ -35,11 +35,11 @@ sys 0m0,901s
```
### Inspect the univention-corporate-server container image
```bash
docker image inspect univention-corporate-server:latest
docker image inspect univention/univention-corporate-server:latest
```
## Build a deployment container image with podman ```( optionally with time )```
```bash
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention/univention-corporate-server"; TAG="latest"; \
time podman build \
--format docker \
--build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
Expand All @@ -49,8 +49,8 @@ MAJOR=5; MINOR=0; PATCH=8; IMAGE="univention-corporate-server"; TAG="latest"; \
--tag ${IMAGE}:${MAJOR}.${MINOR}-${PATCH} \
--tag ${IMAGE}:${TAG} .
...
Successfully tagged univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention-corporate-server:latest
Successfully tagged univention/univention-corporate-server:${MAJOR}.${MINOR}-${PATCH}
Successfully tagged univention/univention-corporate-server:latest
...
real 7m12,531s
user 0m0,105s
Expand All @@ -59,5 +59,5 @@ sys 0m0,126s
```
### Inspect the univention-corporate-server container image
```bash
podman image inspect univention-corporate-server:latest
podman image inspect univention/univention-corporate-server:latest
```
Loading

0 comments on commit 1ec7d94

Please sign in to comment.