From a5f9077e5a7d334e7ec84cedc4d8465ff1e2d910 Mon Sep 17 00:00:00 2001 From: Tiago Pires Date: Mon, 20 Jul 2015 14:53:53 +0100 Subject: Update docker image. Shrink docker image. Update from fig (deprecated) to docker-compose. Update README.md. Signed-off-by: Tiago Pires --- docker/assemble_blocks.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docker/assemble_blocks.sh') diff --git a/docker/assemble_blocks.sh b/docker/assemble_blocks.sh index 852064de..3109a6a0 100755 --- a/docker/assemble_blocks.sh +++ b/docker/assemble_blocks.sh @@ -10,8 +10,8 @@ gogs_config_file=conf.tmp gogs_config=config gogs_init_file=$docker_dir/init_gogs.sh -fig_file=fig.yml -fig_config=fig +compose_file=docker-compose.yml +compose_config=docker-compose gogs_init_template=$template_dir/init_gogs.sh.tpl @@ -28,7 +28,7 @@ if [ "$#" == 0 ]; then exit 0 fi -for file in $gogs_config_file $fig_file; do +for file in $gogs_config_file $compose_file; do if [ -e $file ]; then echo "Deleting $file" rm $file @@ -53,10 +53,10 @@ for dir in $@; do echo "" >> $gogs_config_file fi - if [ -e $current_dir/$fig_config ]; then - echo "Adding $current_dir/$fig_config to $fig_file" - cat $current_dir/fig >> $fig_file - echo "" >> $fig_file + if [ -e $current_dir/$compose_config ]; then + echo "Adding $current_dir/$compose_config to $compose_file" + cat $current_dir/$compose_config >> $compose_file + echo "" >> $compose_file fi done @@ -69,4 +69,4 @@ d if [ -e $gogs_config_file ]; then echo "Removing temporary GoGS config" rm $gogs_config_file -fi \ No newline at end of file +fi -- cgit v1.2.3