diff --git a/component-installer/component-installer.sh b/component-installer/component-installer.sh index 2ee2e66..2119e83 100644 --- a/component-installer/component-installer.sh +++ b/component-installer/component-installer.sh @@ -46,7 +46,7 @@ Requires=docker.service [Service] WorkingDirectory=/opt/opengnsys/ogCore/repo/ ExecStart=/usr/bin/docker compose -f /opt/opengnsys/ogCore/etc/docker-compose-deploy.yml up -ExecStartPost=$CONFIGS_DIR/provision_ogcore.sh +ExecStartPost=/opt/opengnsys/ogCore/bin/provision_ogcore.sh ExecStop=/usr/bin/docker compose -f /opt/opengnsys/ogCore/etc/docker-compose-deploy.yml stop Restart=always @@ -74,7 +74,7 @@ Requires=docker.service [Service] Restart=always -ExecStartPre=/opengnsys-installer/provision_oggui.sh +ExecStartPre=/opt/opengnsys/ogGui/bin/provision_oggui.sh ExecStart=/usr/bin/docker run --rm --name ogGui-app -p 4200:4200 -v $ENV_FILE:/app/.env opengnsys/oggui:$oggui_version ExecStop=/usr/bin/docker stop ogGui-app @@ -111,6 +111,9 @@ do git clone --branch "$OGCORE_BRANCH" "$OGCORE_REPO" "$component_dir/repo" # Copy the docker-compose-deploy.yml file to /opt/opengnsys/ogCore/etc/ mkdir -p $component_dir/etc/ + mkdir -p $component_dir/bin/ + cp provision_ogcore.sh $component_dir/bin/ + chmod 755 $component_dir/bin/provision_ogcore.sh cp $component_dir/repo/docker-compose-deploy.yml $component_dir/etc/ sed -i "s/static/$container_version/g" $component_dir/repo/docker-compose-deploy.yml echo - ogCore >> /etc/issue @@ -120,6 +123,9 @@ do ogGui) echo "Instalando ogGui..." OGGUI_BRANCH=main + mkdir -p $component_dir/bin + cp provision_oggui.sh $component_dir/bin/ + chmod 755 $component_dir/bin/provision_oggui.sh git clone --branch "$OGGUI_BRANCH" "$OGGUI_REPO" "$component_dir/repo" echo - ogGui >> /etc/issue install_docker @@ -149,4 +155,4 @@ do done echo ======================================== >> /etc/issue -rm -f $PAT_FILE +# rm -f $PAT_FILE