Commit 75ac1e63 authored by Bastian Menningen's avatar Bastian Menningen
Browse files

Merge branch 'envs' into 'master'

Deployment auf offizielles jekyll Image umgestellt

See merge request oseg/verein/ose-germany.de!8
parents 449b9810 26c713c4
Pipeline #93 failed with stages
in 11 seconds
......@@ -115,8 +115,10 @@ RUN gem install jekyll -v$JEKYLL_VERSION -- \
RUN bundle install
# --
RUN addgroup -Sg 1000 jekyll
RUN adduser -Su 1000 -G \
ARG RUNNER_GID
ARG RUNNER_UID
RUN addgroup -Sg $RUNNER_GID jekyll
RUN adduser -Su $RUNNER_UID -G \
jekyll jekyll
# --
......
source "https://rubygems.org"
ruby "2.7.1"
gem "jekyll", "~> 4.0.0"
require 'open-uri'
ruby RUBY_VERSION
# This will help ensure the proper Jekyll version is running.
gem "jekyll", "4.1.0"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
group :jekyll_plugins do
gem 'jekyll-environment-variables'
end
end
\ No newline at end of file
version: "3.1"
version: '3'
services:
jekyll-server:
build: ./
jekyll:
container_name: OSE-Germany-jekyll
restart: always
command: jekyll serve --watch
image: jekyll/jekyll:latest
command: jekyll build --watch --force_polling --verbose
env_file:
- .env
volumes:
- .:/srv/jekyll
......@@ -15,11 +15,12 @@ services:
container_name: OSE-Germany-jekyll-php
image: php:7
container_name: OSE-Germany-php
command: php -S 127.0.0.1:4000 -t /srv/jekyll/_site
network_mode: "host"
ports:
- "8099:4000"
command: php -S 0.0.0.0:4000 -t /srv/jekyll/_site
env_file:
- .env
depends_on:
- jekyll-server
- jekyll
ports:
- 4000:4000
volumes:
- .:/srv/jekyll
- .:/srv/jekyll
\ No newline at end of file
stages:
- build
- deploy
Build:
stage: build
tags:
- dezentrale
only:
- master
script:
- docker-compose build
Deploy:
stage: deploy
tags:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment