Skip to content
Snippets Groups Projects
Commit 7331bfc4 authored by dcoutadeur dcoutadeur's avatar dcoutadeur dcoutadeur
Browse files

Merge branch '75-use-docker-images-from-repo' into 'master' 

use docker images provided by main repository (#75)

Closes #75

See merge request !32
parents e824f4e3 d43fe5b9
No related branches found
No related tags found
No related merge requests found
Pipeline #33054 failed
Stage: clean
Stage: build_dependency
Stage: build
Stage: push
Hide whitespace changes
Inline Side-by-side
.env
+ 4
− 0
View file @ 7331bfc4
# Default docker image repository and version
DEFAULT_IMAGE_REPOSITORY=gitlab.ow2.org:4567/fusioniam/fusioniam/
DEFAULT_IMAGE_VERSION=snapshot
#LDAP_CA_CERTIFICATE_FILE=./run/volumes/ldap-tls/ca.crt #LDAP_CA_CERTIFICATE_FILE=./run/volumes/ldap-tls/ca.crt
LDAP_CA_CERTIFICATE_FILE= LDAP_CA_CERTIFICATE_FILE=
#LDAP_CERTIFICATE_FILE=./run/volumes/ldap-tls/openldap.crt #LDAP_CERTIFICATE_FILE=./run/volumes/ldap-tls/openldap.crt
......
Makefile
+ 44
− 10
View file @ 7331bfc4
...@@ -39,6 +39,10 @@ LDAP_CA_CERTIFICATE_FILE ?= /dev/null ...@@ -39,6 +39,10 @@ LDAP_CA_CERTIFICATE_FILE ?= /dev/null
LDAP_CERTIFICATE_FILE ?= /dev/null LDAP_CERTIFICATE_FILE ?= /dev/null
LDAP_CERTIFICATE_KEY ?= /dev/null LDAP_CERTIFICATE_KEY ?= /dev/null
# Default image repository and version
IMAGE_REPOSITORY=$(DEFAULT_IMAGE_REPOSITORY)
IMAGE_VERSION=$(DEFAULT_IMAGE_VERSION)
################################################################################ ################################################################################
# Run commands # Run commands
################################################################################ ################################################################################
...@@ -71,7 +75,7 @@ runldap: startnet ...@@ -71,7 +75,7 @@ runldap: startnet
--detach=true \ --detach=true \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-openldap-ltb:v0.1 $(IMAGE_REPOSITORY)fusioniam-openldap-ltb:$(IMAGE_VERSION)
runwp: startnet runwp: startnet
mkdir -p run/volumes/wp-run mkdir -p run/volumes/wp-run
...@@ -86,7 +90,7 @@ runwp: startnet ...@@ -86,7 +90,7 @@ runwp: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-white-pages:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-white-pages:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh php-fpm /bin/bash /run-ct.sh php-fpm
$(CTN) run \ $(CTN) run \
--env-file=./run/ENVVAR.example \ --env-file=./run/ENVVAR.example \
...@@ -100,7 +104,7 @@ runwp: startnet ...@@ -100,7 +104,7 @@ runwp: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-white-pages:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-white-pages:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh nginx /bin/bash /run-ct.sh nginx
runsd: startnet runsd: startnet
...@@ -116,7 +120,7 @@ runsd: startnet ...@@ -116,7 +120,7 @@ runsd: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-service-desk:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-service-desk:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh php-fpm /bin/bash /run-ct.sh php-fpm
$(CTN) run \ $(CTN) run \
--env-file=./run/ENVVAR.example \ --env-file=./run/ENVVAR.example \
...@@ -130,7 +134,7 @@ runsd: startnet ...@@ -130,7 +134,7 @@ runsd: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-service-desk:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-service-desk:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh nginx /bin/bash /run-ct.sh nginx
runfd: startnet runfd: startnet
...@@ -146,7 +150,7 @@ runfd: startnet ...@@ -146,7 +150,7 @@ runfd: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-fusiondirectory:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-fusiondirectory:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh php-fpm /bin/bash /run-ct.sh php-fpm
$(CTN) run \ $(CTN) run \
--env-file=./run/ENVVAR.example \ --env-file=./run/ENVVAR.example \
...@@ -160,7 +164,7 @@ runfd: startnet ...@@ -160,7 +164,7 @@ runfd: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-fusiondirectory:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-fusiondirectory:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh nginx /bin/bash /run-ct.sh nginx
runlemon: startnet runlemon: startnet
...@@ -192,7 +196,7 @@ runlemon: startnet ...@@ -192,7 +196,7 @@ runlemon: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-lemonldap-ng:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-lemonldap-ng:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh llng-fastcgi-server /bin/bash /run-ct.sh llng-fastcgi-server
$(CTN) run \ $(CTN) run \
--env-file=./run/ENVVAR.example \ --env-file=./run/ENVVAR.example \
...@@ -207,7 +211,7 @@ runlemon: startnet ...@@ -207,7 +211,7 @@ runlemon: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-lemonldap-ng:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-lemonldap-ng:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh nginx /bin/bash /run-ct.sh nginx
$(CTN) run \ $(CTN) run \
--env-file=./run/ENVVAR.example \ --env-file=./run/ENVVAR.example \
...@@ -221,7 +225,7 @@ runlemon: startnet ...@@ -221,7 +225,7 @@ runlemon: startnet
--entrypoint=/usr/bin/tini \ --entrypoint=/usr/bin/tini \
$(UIDMAP) \ $(UIDMAP) \
$(GIDMAP) \ $(GIDMAP) \
fusioniam-lemonldap-ng:v0.1 \ $(IMAGE_REPOSITORY)fusioniam-lemonldap-ng:$(IMAGE_VERSION) \
/bin/bash /run-ct.sh purge-sessions /bin/bash /run-ct.sh purge-sessions
runall: runldap runwp runsd runfd runlemon runall: runldap runwp runsd runfd runlemon
...@@ -278,3 +282,33 @@ enterlemon: ...@@ -278,3 +282,33 @@ enterlemon:
enterfd: enterfd:
$(CTN) exec --user 0 -it $(IDFDB) /bin/bash $(CTN) exec --user 0 -it $(IDFDB) /bin/bash
################################################################################
# rm commands
################################################################################
rmldap:
for container in $(IDLDAP) ; do \
$(CTN) rm $$container ; \
done
rmwp:
for container in $(IDWPF) $(IDWPB) ; do \
$(CTN) rm $$container ; \
done
rmsd:
for container in $(IDSDF) $(IDSDB) ; do \
$(CTN) rm $$container ; \
done
rmlemon:
for container in $(IDLEMONF) $(IDLEMONB) $(IDLEMONC) $(IDBASE) ; do \
$(CTN) rm $$container ; \
done
rmfd:
for container in $(IDFDB) $(IDFDF) ; do \
$(CTN) rm $$container ; \
done
rmall: rmldap rmwp rmsd rmlemon rmfd
README.md
+ 32
− 1
View file @ 7331bfc4
...@@ -240,8 +240,15 @@ docker-compose stop ...@@ -240,8 +240,15 @@ docker-compose stop
``` ```
Remove containers: Remove containers:
```
docker-compose down
```
You can also run locally built image by adding 2 env variables:
``` ```
docker-compose rm fusioniam-access-manager-cron fusioniam-access-manager-fastcgi-server fusioniam-access-manager-nginx fusioniam-database fusioniam-directory-server fusioniam-fusiondirectory-nginx fusioniam-fusiondirectory-php-fpm fusioniam-service-desk-nginx fusioniam-service-desk-php-fpm fusioniam-white-pages-nginx fusioniam-white-pages-php-fpm IMAGE_REPOSITORY="" IMAGE_VERSION="v0.1" docker-compose up -d
``` ```
#### Run with docker or podman #### Run with docker or podman
...@@ -286,6 +293,13 @@ make runfd ...@@ -286,6 +293,13 @@ make runfd
make runlemon make runlemon
``` ```
You can also run locally built image by adding 2 env variables:
```
make runall IMAGE_REPOSITORY="" IMAGE_VERSION="v0.1"
```
Stop all containers: Stop all containers:
``` ```
...@@ -302,6 +316,23 @@ make stopfd ...@@ -302,6 +316,23 @@ make stopfd
make stoplemon make stoplemon
``` ```
Remove containers:
```
make rmall
```
Remove specific containers:
```
make rmldap
make rmwp
make rmsd
make rmfd
make rmlemon
```
### Start reverse proxy ### Start reverse proxy
On your host, start a reverse proxy that will connect to containers. On your host, start a reverse proxy that will connect to containers.
......
docker-compose.yml
+ 10
− 10
View file @ 7331bfc4
...@@ -4,7 +4,7 @@ services: ...@@ -4,7 +4,7 @@ services:
# OpenLDAP # OpenLDAP
fusioniam-directory-server: fusioniam-directory-server:
restart: unless-stopped restart: unless-stopped
image: fusioniam-openldap-ltb:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-openldap-ltb:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-directory-server" container_name: "fusioniam-directory-server"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -20,7 +20,7 @@ services: ...@@ -20,7 +20,7 @@ services:
# WP php-fpm # WP php-fpm
fusioniam-white-pages-php-fpm: fusioniam-white-pages-php-fpm:
restart: unless-stopped restart: unless-stopped
image: fusioniam-white-pages:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-white-pages:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-white-pages-php-fpm" container_name: "fusioniam-white-pages-php-fpm"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -35,7 +35,7 @@ services: ...@@ -35,7 +35,7 @@ services:
# WP nginx # WP nginx
fusioniam-white-pages-nginx: fusioniam-white-pages-nginx:
restart: unless-stopped restart: unless-stopped
image: fusioniam-white-pages:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-white-pages:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-white-pages-nginx" container_name: "fusioniam-white-pages-nginx"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -52,7 +52,7 @@ services: ...@@ -52,7 +52,7 @@ services:
# SD php-fpm # SD php-fpm
fusioniam-service-desk-php-fpm: fusioniam-service-desk-php-fpm:
restart: unless-stopped restart: unless-stopped
image: fusioniam-service-desk:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-service-desk:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-service-desk-php-fpm" container_name: "fusioniam-service-desk-php-fpm"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -67,7 +67,7 @@ services: ...@@ -67,7 +67,7 @@ services:
# SD nginx # SD nginx
fusioniam-service-desk-nginx: fusioniam-service-desk-nginx:
restart: unless-stopped restart: unless-stopped
image: fusioniam-service-desk:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-service-desk:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-service-desk-nginx" container_name: "fusioniam-service-desk-nginx"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -96,7 +96,7 @@ services: ...@@ -96,7 +96,7 @@ services:
# llng-fastcgi-server # llng-fastcgi-server
fusioniam-access-manager-fastcgi-server: fusioniam-access-manager-fastcgi-server:
restart: unless-stopped restart: unless-stopped
image: fusioniam-lemonldap-ng:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-lemonldap-ng:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-access-manager-fastcgi-server" container_name: "fusioniam-access-manager-fastcgi-server"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -112,7 +112,7 @@ services: ...@@ -112,7 +112,7 @@ services:
# fusioniam-access-manager-nginx # fusioniam-access-manager-nginx
fusioniam-access-manager-nginx: fusioniam-access-manager-nginx:
restart: unless-stopped restart: unless-stopped
image: fusioniam-lemonldap-ng:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-lemonldap-ng:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-access-manager-nginx" container_name: "fusioniam-access-manager-nginx"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -127,7 +127,7 @@ services: ...@@ -127,7 +127,7 @@ services:
# fusioniam-access-manager-cron # fusioniam-access-manager-cron
fusioniam-access-manager-cron: fusioniam-access-manager-cron:
restart: unless-stopped restart: unless-stopped
image: fusioniam-lemonldap-ng:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-lemonldap-ng:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-access-manager-cron" container_name: "fusioniam-access-manager-cron"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -140,7 +140,7 @@ services: ...@@ -140,7 +140,7 @@ services:
# fusioniam-fusiondirectory-php-fpm # fusioniam-fusiondirectory-php-fpm
fusioniam-fusiondirectory-php-fpm: fusioniam-fusiondirectory-php-fpm:
restart: unless-stopped restart: unless-stopped
image: fusioniam-fusiondirectory:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-fusiondirectory:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-fusiondirectory-php-fpm" container_name: "fusioniam-fusiondirectory-php-fpm"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
...@@ -154,7 +154,7 @@ services: ...@@ -154,7 +154,7 @@ services:
# fusioniam-fusiondirectory-nginx # fusioniam-fusiondirectory-nginx
fusioniam-fusiondirectory-nginx: fusioniam-fusiondirectory-nginx:
restart: unless-stopped restart: unless-stopped
image: fusioniam-fusiondirectory:v0.1 image: ${IMAGE_REPOSITORY-gitlab.ow2.org:4567/fusioniam/fusioniam/}fusioniam-fusiondirectory:${IMAGE_VERSION-snapshot}
container_name: "fusioniam-fusiondirectory-nginx" container_name: "fusioniam-fusiondirectory-nginx"
env_file: env_file:
- ./run/ENVVAR.example - ./run/ENVVAR.example
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment