spectat-jekyll 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 57c823e249ee7a8acfd21954385a87088bae13d37ad945a30a67c906e64bff80
4
- data.tar.gz: bf802c351382327405bd43da745f661d1237449f3a515f65b4d44bff52151092
3
+ metadata.gz: 49b0d45c6e880e5139df4e02371a2792b59e7cc8bfb3dad3de9e679d3ff218b3
4
+ data.tar.gz: 0d59c617b223eed203e4e069abda0cb273fab9e0cdde73edd7b60ff41a89d4b3
5
5
  SHA512:
6
- metadata.gz: 0c2034fcbab16880d7e7605905b195881ac5ed0a03b3ccf274d8f12607970b06346814b54b505a959b561418706e01e0c6d4854fdef69d3543abd37a8564b99e
7
- data.tar.gz: 8474db0165118f20f89311652891b6b00ec570d8a1b31e6a11b550162c440309969c559afccf38e8ea6135a7aac6e7a2e685dc82de39f90a2ad930c4d30f215f
6
+ metadata.gz: 49b6d53460a77a4fa32c604cc25e43c44510fd6c5e25ca88279e8e6cde73998e9dab10c52d0ba2093c06c812ef322ab3b288f6060538bbda2f5435844f251d46
7
+ data.tar.gz: 0f2c436a17ed2d629bf41453a195f68e60dfc6acea3338971535848ae12a537676e68e08cce8441c091d2eaf0856cd3b081593035f789c11cf2086951463f8dc
@@ -21,9 +21,9 @@ stages:
21
21
 
22
22
  # Ensure that the site builds {{{
23
23
  build_image:
24
- image: docker:1.13
24
+ image: docker
25
25
  services:
26
- - docker:1.13-dind
26
+ - docker:dind
27
27
  stage: build
28
28
  script:
29
29
  # Grab the private submodules (public are fine) {{{
@@ -33,21 +33,26 @@ build_image:
33
33
  - git submodule update --init
34
34
  # }}}
35
35
 
36
+ - apk --update ruby-dev ruby-bundler build-base \
37
+ libffi-dev \
38
+ libxml2-dev libxslt-dev
39
+ - bundle install
40
+
36
41
  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
37
42
  # pull the latest base image on a master build
38
43
  - docker pull $CONTAINER_BUILDER_IMAGE || docker pull $RELEASE_CONTAINER_BUILDER_IMAGE || true
39
44
  # Build the builder image {{{
40
- - <%= Spectat::Jekyll::RakeTask::DockerHelper.new(@full_repo_path, :builder, '$CI_COMMIT_REF_SLUG').docker_build_command %>
45
+ - bundle exec rake "docker:build[<%= @full_repo_path %>,builder,$CI_COMMIT_REF_SLUG]"
41
46
  - docker push $CONTAINER_BUILDER_IMAGE
42
47
  # }}}
43
48
  # Build the built image {{{
44
49
  - docker run -v $(readlink -f .):/app/site $CONTAINER_BUILDER_IMAGE gulp build --production
45
- - <%= Spectat::Jekyll::RakeTask::DockerHelper.new(@full_repo_path, :built, '$CI_COMMIT_REF_SLUG').docker_build_command %>
50
+ - bundle exec rake "docker:build[<%= @full_repo_path %>,built,$CI_COMMIT_REF_SLUG]"
46
51
  - docker push $CONTAINER_BUILT_IMAGE
47
52
  # }}}
48
53
  # Build the deploy image {{{
49
54
  - docker pull $CONTAINER_DEPLOY_IMAGE || docker pull $RELEASE_CONTAINER_DEPLOY_IMAGE || true
50
- - <%= Spectat::Jekyll::RakeTask::DockerHelper.new(@full_repo_path, :deploy, '$CI_COMMIT_REF_SLUG').docker_build_command %>
55
+ - bundle exec rake "docker:build[<%= @full_repo_path %>,deploy,$CI_COMMIT_REF_SLUG]"
51
56
  - docker push $CONTAINER_DEPLOY_IMAGE
52
57
  # }}}
53
58
  # }}}
@@ -1,5 +1,5 @@
1
1
  module Spectat
2
2
  module Jekyll
3
- VERSION = '0.2.2'.freeze
3
+ VERSION = '0.2.3'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spectat-jekyll
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jamie Tanna