Skip to content
Snippets Groups Projects
Commit 345d8096 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed CI setup. Updated version info.

parent a7700eae
No related branches found
No related tags found
No related merge requests found
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6.0 (~/python_GFZ/python/bin/python3.6)" project-jdk-type="Python SDK" />
<component name="PythonCompatibilityInspectionAdvertiser">
<option name="version" value="3" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/pyrsr.iml" filepath="$PROJECT_DIR$/.idea/pyrsr.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PySciProjectComponent">
<option name="PY_SCI_VIEW" value="true" />
<option name="PY_SCI_VIEW_SUGGESTED" value="true" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PackageRequirementsSettings">
<option name="requirementsPath" value="" />
</component>
<component name="PyDocumentationSettings">
<option name="renderExternalDocumentation" value="true" />
</component>
<component name="TestRunnerService">
<option name="projectConfiguration" value="Nosetests" />
<option name="PROJECT_TEST_RUNNER" value="Nosetests" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.1.0' __version__ = '0.2.0'
__versionalias__ = '20190820.01' __versionalias__ = '20190822.01'
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
context_dir="./context" context_dir="./context"
dockerfile="pyrsr_ci.docker" dockerfile="pyrsr_ci.docker"
tag="spechomo_ci:0.0.1" tag="pyrsr_ci:0.2.0"
gitlab_runner="spechomo_gitlab_CI_runner" gitlab_runner="pyrsr_gitlab_CI_runner"
echo "#### Build runner docker image" echo "#### Build runner docker image"
sudo docker rmi ${tag} sudo docker rmi ${tag}
sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir} sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir}
# sudo docker build -f ./context/pyrsr_ci.docker -m 20G -t spechomo_ci:0.7.0 ./context --no-cache # sudo docker build -f ./context/pyrsr_ci.docker -m 20G -t pyrsr_ci:0.2.0 ./context --no-cache
echo "#### Create gitlab-runner (daemon) container with tag; ${tag}" echo "#### Create gitlab-runner (daemon) container with tag; ${tag}"
sudo docker stop ${gitlab_runner} sudo docker stop ${gitlab_runner}
...@@ -16,7 +16,7 @@ sudo docker rm ${gitlab_runner} ...@@ -16,7 +16,7 @@ sudo docker rm ${gitlab_runner}
sudo docker run -d --name ${gitlab_runner} --restart always \ sudo docker run -d --name ${gitlab_runner} --restart always \
-v /var/run/docker.sock:/var/run/docker.sock gitlab/gitlab-runner:latest -v /var/run/docker.sock:/var/run/docker.sock gitlab/gitlab-runner:latest
echo "#### Register container at gitlab, get token here https://gitext.gfz-potsdam.de/geomultisens/spechomo/settings/ci_cd" echo "#### Register container at gitlab, get token here https://gitext.gfz-potsdam.de/geomultisens/pyrsr/settings/ci_cd"
read -p "Please enter gitlab token: " token read -p "Please enter gitlab token: " token
echo "" echo ""
read -p "Please enter gitlab runner name: " runner_name read -p "Please enter gitlab runner name: " runner_name
...@@ -26,6 +26,6 @@ sudo docker exec -it ${gitlab_runner} /bin/bash -c "export RUNNER_EXECUTOR=docke ...@@ -26,6 +26,6 @@ sudo docker exec -it ${gitlab_runner} /bin/bash -c "export RUNNER_EXECUTOR=docke
--registration-token '${token}' \ --registration-token '${token}' \
--run-untagged=true \ --run-untagged=true \
--locked=true \ --locked=true \
--tag-list spechomo_client \ --tag-list pyrsr_client \
--description '${runner_name}' \ --description '${runner_name}' \
--docker-image '${tag}' " --docker-image '${tag}' "
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment