New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove mocks from cluster, replace with httpd image, add template engine #33

Merged
merged 7 commits into from Dec 3, 2018

Conversation

Projects
None yet
2 participants
@Skejven
Copy link
Member

Skejven commented Dec 3, 2018

Description

Update Knot.x cluster example to template engine.
Get rid of Knot.x mocks and replace with simple httpd base images (repository and services).

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

I hereby agree to the terms of the Knot.x Contributor License Agreement.

@Skejven Skejven requested a review from marcinczeczko Dec 3, 2018

Skejven added some commits Dec 3, 2018

Merge remote-tracking branch 'origin/feature/switch-to-knotx-template…
…-engine' into feature/update-cluster-to-template-engine
Merge remote-tracking branch 'origin/feature/switch-to-knotx-template…
…-engine' into feature/update-cluster-to-template-engine
@@ -0,0 +1,5 @@
FROM httpd:2.4

This comment has been minimized.

@tomaszmichalak

tomaszmichalak Dec 3, 2018

Contributor

Nice !

Show resolved Hide resolved acme-cluster/acmeRepo/public_html/content/remote/login/step1.html
Show resolved Hide resolved acme-cluster/core/conf/global.conf

@tomaszmichalak tomaszmichalak merged commit ddd4a87 into feature/switch-to-knotx-template-engine Dec 3, 2018

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details

@tomaszmichalak tomaszmichalak deleted the feature/update-cluster-to-template-engine branch Dec 3, 2018

Fixing syntax issue in knotx-stack.json, fixing domain/port in sample…
… services configuration, temporary fix with if-modified-since for remote content.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment