sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Docker updates

Browse source
This commit is contained in:
Darren Clarke 2023-02-10 12:14:44 +00:00
parent e556cdceba
commit bef49705a4
8 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -62,9 +62,8 @@ force-run-migrations:
docker-compose -p link-docker-compose exec zammad-railsserver bundle exec rails r 'require "/opt/zammad/db/addon/cdr_signal/20210525091356_cdr_signal_channel.rb";require "/opt/zammad/db/addon/cdr_voice/20210525091357_cdr_voice_channel.rb";require "/opt/zammad/db/addon/cdr_whatsapp/20210525091358_cdr_whatsapp_channel.rb"; require "/opt/zammad/db/addon/pgpsupport/20220403000001_pgpsupport.rb";CdrSignalChannel.new.up;CdrVoiceChannel.new.up;CdrWhatsappChannel.new.up;PGPSupport.new.up;'
sso:
docker-compose -p link-docker-compose exec zammad-nginx sed -i '/proxy_pass http:\/\/zammad-railsserver;/a proxy_set_header X-Forwarded-Ssl on;' /opt/zammad/contrib/nginx/zammad.conf;
docker-compose -p link-docker-compose exec zammad-nginx sed -i '/proxy_pass http:\/\/zammad-websocket;/a proxy_set_header X-Forwarded-Ssl on;' /opt/zammad/contrib/nginx/zammad.conf;
docker-compose -p link-docker-compose exec zammad-nginx service nginx restart;
docker-compose -p link-shell exec zammad-nginx sed -i '/proxy_set_header X-Forwarded-User "";/d' /opt/zammad/contrib/nginx/zammad.conf;
docker-compose -p link-shell exec zammad-nginx service nginx restart;
start:
CURRENT_UID=$(CURRENT_UID) docker-compose up -d