diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b6425f3b161ef4a71666712f22e06bc991ac8a9..25bff3ad577e7b567ece53263742a8c234cade23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,40 @@ -stages: - - deploy - -#muss als root, wird daher manuell gemacht -#before_script: -# - gem install bundler +image: malteschmitz/ruby:2.6.6 +# Cache modules in between jobs cache: - paths: - - vendor/ + key: ${CI_COMMIT_REF_SLUG} + paths: + - vendor/ + +before_script: + # Install ssh-agent if not already installed, it is required by Docker. + # (change apt-get to yum if you use a CentOS-based image) + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + + # Run ssh-agent (inside the build environment) + - eval $(ssh-agent -s) + + # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + - ssh-add <(echo "$SSH_PRIVATE_KEY") + + # For Docker builds disable host key checking. Be aware that by adding that + # you are suspectible to man-in-the-middle attacks. + # WARNING: Use this only with the Docker executor, if you use it with shell + # you will overwrite your user's SSH config. + # - mkdir -p ~/.ssh + # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + # In order to properly check the server's host key, assuming you created the + # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines + # instead. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts' -deploy_site: - stage: deploy - only: - - master - script: - - env LANG=en_US.UTF-8 bundle install --path=vendor/ - - env LANG=en_US.UTF-8 bundle exec jekyll build - - rsync -av --delete-after _site/ chaotikum-org@web:_site/ +deploy: + only: + - master + tags: + - docker + script: + - bundle install --path=vendor/ + - bundle exec jekyll build + - rsync -av --delete-after _site/ chaotikum-org@[2a01:4f8:160:3067::a]:_site/ diff --git a/_events/20200615-nookorga.markdown b/_events/20200615-nookorga.markdown index e0622353b5aff57cfa2bbbc9ff59ff83ab4a1d03..d167e6375c792e2e1aa4f4ee18317dba9fa01973 100644 --- a/_events/20200615-nookorga.markdown +++ b/_events/20200615-nookorga.markdown @@ -2,7 +2,7 @@ layout: [eventcal] title: "NooK Orga Online" image: "/assets/wall.png" -eventdate: 2020-06-15 20:00:00 +0200 +eventdate: 2020-06-15 19:00:00 +0200 eventend: 2020-06-15 22:00:00 +0200 #https://www.uuidgenerator.net/ uid: 31672320-21ce-44f6-b934-f65ddf30c2f7