To publish to GitLab pages, all that is required is to provide a CI job that creates files in a directory called "public" and list that as an artifact. When the CI job completes, the website is immediately available at the URL https://username.gitlab.io/reponame. This makes it much easier to preview changes to the site than with OpenShift apps. Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- .gitlab-ci.yml | 9 +++++++++ README.md | 14 ++++---------- {web => public}/header-bg.png | Bin {web => public}/index.css | 0 {web => public}/index.html | 4 +--- {web => public}/logo-kvm.png | Bin {web => public}/logo-libguestfs.png | Bin {web => public}/logo-libosinfo.png | Bin {web => public}/logo-libvirt.png | Bin {web => public}/logo-qemu.png | Bin {web => public}/logo-virt-manager.png | Bin {web => public}/logo.png | Bin {web => public}/logo.xcf | Bin 13 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 .gitlab-ci.yml rename {web => public}/header-bg.png (100%) rename {web => public}/index.css (100%) rename {web => public}/index.html (93%) rename {web => public}/logo-kvm.png (100%) rename {web => public}/logo-libguestfs.png (100%) rename {web => public}/logo-libosinfo.png (100%) rename {web => public}/logo-libvirt.png (100%) rename {web => public}/logo-qemu.png (100%) rename {web => public}/logo-virt-manager.png (100%) rename {web => public}/logo.png (100%) rename {web => public}/logo.xcf (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..5613e31 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ + +image: centos:8 + +pages: + script: + - /bin/true + artifacts: + paths: + - public diff --git a/README.md b/README.md index 5b7a60d..a0c5a5e 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,8 @@ This directory contains content / configuration for managing * [https://www.virttools.org](https://www.virttools.org) * [https://www.virt-tools.org](https://www.virt-tools.org) -The site is setup to run under OpenShift +The site is intended to be published with GitLab Pages -Initial load can be done with - -``` - oc process -f virttools-web/openshift/templates/virttools-web.json | oc create -f - -``` - -Updates to the OpenShift config are manually activated using `oc replace`. - -Updates to the content itself are automatically propagated via a web hook. +Upon pushing changes to the GitLab repository, CI rules will automatically +build the site and publish the result to the repository's GitLab Pages +site. diff --git a/web/header-bg.png b/public/header-bg.png similarity index 100% rename from web/header-bg.png rename to public/header-bg.png diff --git a/web/index.css b/public/index.css similarity index 100% rename from web/index.css rename to public/index.css diff --git a/web/index.html b/public/index.html similarity index 93% rename from web/index.html rename to public/index.html index 3fb6f48..d801c48 100644 --- a/web/index.html +++ b/public/index.html @@ -92,9 +92,7 @@ <div id="footer"> - <a href="https://www.openshift.com/" title="Powered by OpenShift Online"> - <img alt="Powered by OpenShift Online" src="https://www.openshift.com/images/logos/powered_by_openshift_reverse.png"> - </a> + <a href="https://gitlab.com/libvirt/virttools-web/-/blob/master/public/index.html" title="Edit this page">Edit this page</a> </div> </body> </html> diff --git a/web/logo-kvm.png b/public/logo-kvm.png similarity index 100% rename from web/logo-kvm.png rename to public/logo-kvm.png diff --git a/web/logo-libguestfs.png b/public/logo-libguestfs.png similarity index 100% rename from web/logo-libguestfs.png rename to public/logo-libguestfs.png diff --git a/web/logo-libosinfo.png b/public/logo-libosinfo.png similarity index 100% rename from web/logo-libosinfo.png rename to public/logo-libosinfo.png diff --git a/web/logo-libvirt.png b/public/logo-libvirt.png similarity index 100% rename from web/logo-libvirt.png rename to public/logo-libvirt.png diff --git a/web/logo-qemu.png b/public/logo-qemu.png similarity index 100% rename from web/logo-qemu.png rename to public/logo-qemu.png diff --git a/web/logo-virt-manager.png b/public/logo-virt-manager.png similarity index 100% rename from web/logo-virt-manager.png rename to public/logo-virt-manager.png diff --git a/web/logo.png b/public/logo.png similarity index 100% rename from web/logo.png rename to public/logo.png diff --git a/web/logo.xcf b/public/logo.xcf similarity index 100% rename from web/logo.xcf rename to public/logo.xcf -- 2.24.1