diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-10-05 07:26:37 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-10-05 07:26:37 +0200 |
| commit | f18d78bb5330bf8916f9785cea22a74dcc1531c9 (patch) | |
| tree | a72c4ffb336ab38817644c237bca77575dd78653 /adei | |
| parent | 5374bef630025b10478f0c234b4e37fc29b3be93 (diff) | |
| download | adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.gz adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.bz2 adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.tar.xz adei-f18d78bb5330bf8916f9785cea22a74dcc1531c9.zip | |
Reorganize make procedure for adei-mini
Diffstat (limited to 'adei')
| -rw-r--r-- | adei/Dockerfile.mini | 44 | ||||
| -rw-r--r-- | adei/Makefile | 24 |
2 files changed, 65 insertions, 3 deletions
diff --git a/adei/Dockerfile.mini b/adei/Dockerfile.mini new file mode 100644 index 0000000..4845c18 --- /dev/null +++ b/adei/Dockerfile.mini @@ -0,0 +1,44 @@ +FROM chsa/microadei:latest +MAINTAINER Suren A. Chilingaryan <csa@suren.me> + +VOLUME /adei + +ENV ADEI_REVISION=last:1 \ + ADEI_PARALLEL=sources \ + ADEI_SETUP=all \ + ADEI_ENABLED_SETUPS="autogen logs" \ + ADEI_PORTS=80 \ + APACHE_SERVERS=0 \ + MYSQL_SERVER=adei-mysql \ + MYSQL_PORT=3306 \ + MYSQL_USER=adei \ + MYSQL_PASSWORD=adei \ + MYSQL_DATABASE=adei \ + LANG=en_US.UTF-8 \ + LANGUAGE=en_US:en \ + LC_ALL=en_US.UTF-8 + +COPY files/ / + +RUN bash -c 'mkdir -p /adei/{src,cfg,tmp,sys,log,mail}' && \ + \ +# Replace packaged ADEI with repository version + mkdir -p /srv/www/htdocs && \ + ln -s /adei/src /srv/www/htdocs/adei && \ + for name in $(find /srv -mindepth 1 -maxdepth 1 -name '*.sh'); do rm "$name"; ln -s "/adei/src/scripts/cron/$(basename $name)" "$name"; done && \ + rm -f /etc/cron.d/adei.cron && \ + ln -s /adei/src/scripts/cron/adei.cron /etc/cron.d/adei.cron && \ + \ +# Consolidate all volumes in /adei + rm -rf /var/spool/mail && \ + ln -s /adei/log /var/spool/mail && \ + \ +# Modify for non-priviledged mode + chmod +rx /etc/php5/conf.d && \ + \ +# Ugly python needs to resolve user name + chmod g=u /etc/passwd + + +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD /bin/bash diff --git a/adei/Makefile b/adei/Makefile index eb40411..1a88f6f 100644 --- a/adei/Makefile +++ b/adei/Makefile @@ -1,7 +1,25 @@ -all: build -install: push +all: build build-mini +mini: build-mini +install: push push-mini +install-mini: push-mini -.PHONY: rebuild build push start stop restart bash +.PHONY: rebuild build push start stop restart bash mini install-mini deps-mini build-mini rebuild-mini push-mini bash-mini + +deps-mini: + docker pull chsa/microadei:latest + +build-mini: deps-mini Dockerfile.mini + docker build -f Dockerfile.mini --tag chsa/adei-minimal:latest . +# docker build -f Dockerfile.mini --tag chsa/adei-minimal-squashed:latest --squash . + +rebuild-mini: deps-mini Dockerfile.mini + docker build -f Dockerfile.mini --tag chsa/adei-minimal:lates --no-cache . + +push-mini: build-mini + docker push chsa/adei-minimal:latest + +bash-mini: build-mini + docker exec -it adei-minimal /bin/bash build: Dockerfile docker build --tag chsa/adei:latest . |