From e10d842f3514359f2a57441f631c81fff6e5e378 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Nov 29 2018 20:49:55 +0000 Subject: Merge branch 'master' of ssh://pagure.io/Fedora-Council/council-docs --- diff --git a/README.md b/README.md index e5ee257..f10a398 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This repo includes scripts to build and preview the contents of this repository. **NOTE**: Please note that if you reference pages from other repositoreis, such links will be broken in this local preview as it only builds this repository. If you want to rebuild the whole Fedora Docs site, please see [the Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o/) for instructions. -Both scripts use docker, so please make sure you have it installed on your system. Please see below for instructions. +Both scripts work on Fedora (using Podman) and macOS (using Docker). To build and preview the site, run: @@ -35,9 +35,10 @@ $ ./build.sh && ./preview.sh The result will be available at http://localhost:8080 -### Installing docker on Fedora +### Installing Podman on Fedora + +Fedora Workstation doesn't come with Podman preinstalled by default — so you might need to install it using the following command: ``` -$ sudo dnf install docker -$ sudo systemctl start docker && sudo systemctl enable docker +$ sudo dnf install podman ``` diff --git a/build.sh b/build.sh index c9349e3..1e4db2d 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,46 @@ #!/bin/sh +image="docker.io/antora/antora" +cmd="--html-url-extension-style=indexify site.yml" + if [ "$(uname)" == "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. - docker run --rm -it -v $(pwd):/antora antora/antora --html-url-extension-style=indexify site.yml + echo "" + echo "This build script is using Docker container runtime to run the build in an isolated environment." + echo "" + docker run --rm -it -v $(pwd):/antora $image $cmd elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Let's assume that it's running the Docker deamon + # Check whether podman is available, else faill back to docker # which requires root. - echo "" - echo "This build script is using Docker to run the build in an isolated environment. You might be asked for a root password in order to start it." -sudo docker run --rm -it -v $(pwd):/antora:z antora/antora --html-url-extension-style=indexify site.yml + + if [ -f /usr/bin/podman ]; then + echo "" + echo "This build script is using Podman to run the build in an isolated environment." + echo "" + podman run --rm -it -v $(pwd):/antora:z $image $cmd + + elif [ -f /usr/bin/docker ]; then + echo "" + echo "This build script is using Docker to run the build in an isolated environment." + echo "" + + if groups | grep -wq "docker"; then + docker run --rm -it -v $(pwd):/antora:z $image $cmd + else + echo "" + echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." + echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." + echo "" + sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd + fi + else + echo "" + echo "Error: Container runtime haven't been found on your system. Fix it by:" + echo "$ sudo dnf install podman" + exit 1 + fi fi diff --git a/council/modules/ROOT/assets/images/jonatoni.jpg b/council/modules/ROOT/assets/images/jonatoni.jpg new file mode 100644 index 0000000..60b65e5 Binary files /dev/null and b/council/modules/ROOT/assets/images/jonatoni.jpg differ diff --git a/council/modules/ROOT/pages/diversity-advisor.adoc b/council/modules/ROOT/pages/diversity-advisor.adoc index 5d571a3..8f9f713 100644 --- a/council/modules/ROOT/pages/diversity-advisor.adoc +++ b/council/modules/ROOT/pages/diversity-advisor.adoc @@ -1,4 +1,5 @@ = Fedora Diversity Advisor = + The *Fedora Diversity Advisor* acts as a source of support and information for all contributors and users, especially those from underrepresented populations, so that issues of inclusion and equity can @@ -11,12 +12,12 @@ participation in third-party outreach programs and events. == Current Diversity Advisor -image::https://fedoraproject.org/w/uploads/7/7c/My.jpg[float="right",50%] -link:https://fedoraproject.org/wiki/User:Amsharma[Amita Sharma] has been involved with the Fedora project since 2011. -She started her contributions with work in Fedora QA. -She is also a founding member of the Fedora Diversity Team. -After contributing to the Diversity Team for around 2 years, Amita got the opportunity to represent the team as the Diversity Representative on the Fedora Council. -Amita works as a full time Senior Quality Assurance Engineer on Red Hat Directory Server at Red Hat in Pune, India. +[.profile-picture] +image::jonatoni.jpg[] +link:https://fedoraproject.org/wiki/User:Jonatoni[Jona Azizaj] has been involved with the Fedora Project since late 2014. +She started as an Ambassador, promoting Fedora at her local hackerspace and leading the local Albanian Fedora community. +Later on, she joined CommOps, Localization (L10n), Marketing and FAmSCo to get more involved with the community. +After Flock 2016 she joined the Fedora Diversity Team, and since then she has contributed and been part of this team. *Information about the Fedora Diversity Team is available at link:https://fedoraproject.org/wiki/Diversity[the team's wiki page]* @@ -35,9 +36,8 @@ Amita works as a full time Senior Quality Assurance Engineer on Red Hat Director [[contact]] == Contact -Contact Amita Sharma online by pinging *Amita* on -#fedora-diversity on FreeNode IRC. The Diversity Advisor also joins -the link:https://fedoraproject.org/wiki/Diversity[Fedora Diversity +Contact Jona online by pinging (`jonatoni`) on #fedora-diversity on FreeNode IRC or by mail (`jonatoni@fedoraproject.org`). +The Diversity Advisor also joins the link:https://fedoraproject.org/wiki/Diversity[Fedora Diversity team meetings]. [[selection]] @@ -48,12 +48,15 @@ link:https://fedoraproject.org/wiki/Diversity[Fedora Diversity team] and approved by the Fedora Council. Currently the Diversity Team has decided to rotate the position with every release of Fedora. -== History of Fedora Community Action and Impact Coordinators +== History of Fedora Diversity Advisor |=== |Releases | Diversity Advisor -|27, … +|29, ... +|https://fedoraproject.org/wiki/User:Jonatoni + +|27, 28 |https://fedoraproject.org/wiki/User:Amsharma[Amita Sharma] |23, 24, 26, 26 diff --git a/council/modules/ROOT/pages/members.adoc b/council/modules/ROOT/pages/members.adoc index 2796e0b..1d46338 100644 --- a/council/modules/ROOT/pages/members.adoc +++ b/council/modules/ROOT/pages/members.adoc @@ -24,28 +24,28 @@ around package lifetime management and package signing. As an Ambassador, he represented Fedora in various Events such as the Chaos Communication Congress, FOSDEM, FrOSCon and OpenRheinRuhr. He started to serve on FESCo in 2017 and the following year on the Fedora Council. - ++ In the past he helped to establish the penetration testing company RedTeam Pentesting. Nowadays he maintains the network Linux System Role and NMState on Red Hat's network services team. -* Engineering Representative: *Josh Boyer* +* Engineering Representative: *Petr Šabata* ++ +Petr has been an occasional Fedora user since the very beginning and fully +involved as a full-time packager since 2010. Over time he has contributed to +a number of SIGs and has worked on various parts of the distribution. + -Josh has been involved with Fedora for over 10 years. He started as nothing -more than a user, then a mailing list contributor, and has continued to -participate in a number of different SIGs, committees, and roles. Josh -is currently on the Fedora Engineering Steering Committee in addition to his -Council role. He works at Red Hat in the Platform Engineering organization. +He is a Red Hatter and, in addition to his Council role, is currently also on +the Fedora Engineering Steering Comittee. + -You can find him on Freenode irc as `jwb`. +You can find him on Freenode IRC as `contyk`. * Mindshare Representative: *Sumantro Mukherjee* + -* Diversity Team Representative: *Amita Sharma* - +* Diversity Team Representative: *Jona Azizaj* + Read more about the xref:diversity-advisor.adoc[Fedora Diversity Advisor's role] and current Fedora Diversity Advisor's xref:diversity-advisor.adoc[biography] on the page about this position. @@ -62,16 +62,16 @@ Read more about the xref:fcaic.adoc[Fedora Community Action and Impact Coordinat Read more about the xref:fpgm.adoc[Fedora Program Manager's role] and the current FPgM's xref:fpgm.adoc[biography] on the page about this position. * Objective Leads: - * *https://fedoraproject.org/wiki/User:Langdon[Langdon White]* (Fedora Modularity) - + +** *https://fedoraproject.org/wiki/User:Langdon[Langdon White]* (Fedora Modularity) ++ Langdon has been an active Fedora user and contributor for about 7 years and a Linux user for roughly 20 years. Most of that time, Langdon has been a developer targeting Linux or Windows but has also been a sys admin for short stints. His most active project in Fedora is the Modularity Objective which touches almost every part of project. + Langdon has 15+ years of experience with large, complex, multi-faceted software projects. He has worked with Fortune 50 CEOs and 10 person startups to help them realize their business goals through software. He has also worked as a developer advocate for RHEL (and, by extension, Fedora). + You can find him on Freenode irc as `langdon`. - + - * *Dominik Perpeet* (Atomic CI/CD) - + + +** *Dominik Perpeet* (Atomic CI/CD) ++ Dominik joined the Fedora community as a contributor to the Cockpit project, by interfacing with a lot of different aspects of Fedora through that work and also by becoming part of the Fedora Server SIG. He works at Red Hat as part of the @@ -80,7 +80,11 @@ large scale image analysis (working with colorful pictures). He now enjoys working towards his vision of CI/CD giving the onerous aspects of developing software to a bunch of robots while contributors can focus on creating beautiful things that just work. - + - * *Peter Robinson* (Internet of Things) - + + +** *Peter Robinson* (Internet of Things) ++ Peter is the lead architect for Linux IoT platforms at Red Hat. He's be at Red Hat over five years and done a number of roles, he's been an Open Source user and contributor since the mid 1990s, and has wide experience in IT from SME, large Telco/hosting providers and quite a bit in between. He's been working on IoT for a number of years, with specific interest in agriculture due to growing up on a farm in country Australia. + +** *Paul W. Frields* (Lifecycle) ++ +Paul W. Frields has been a Linux user and enthusiast since 1997, and joined the Fedora Project in 2003, shortly after launch. He was a founding member of the Fedora Project Board, and has worked on documentation, website publishing, advocacy, toolchain development, and maintaining software. He joined Red Hat as Fedora Project Leader from February 2008 to July 2010, and remains with Red Hat as an engineering manager. He currently lives with his wife and two children in Virginia. diff --git a/preview.sh b/preview.sh index acab783..aeed9f1 100755 --- a/preview.sh +++ b/preview.sh @@ -5,14 +5,13 @@ if [ "$(uname)" == "Darwin" ]; then # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "The preview will be available at http://localhost:8080/" - docker run --rm -v $(pwd)/public:/usr/share/nginx/html:ro -p 8080:80 nginx + docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Let's assume that it's running the Docker deamon - # which requires root. + # Fedora Workstation has python3 installed as a default, so using that echo "" - echo "This build script is using Docker to run the build in an isolated environment. You might be asked for a root password in order to start it." - echo "The preview will be available at http://localhost:8080/" - sudo docker run --rm -v $(pwd)/public:/usr/share/nginx/html:ro -p 8080:80 nginx + echo "The preview is available at http://localhost:8080" + echo "" + python3 -m http.server --directory ./public 8080 fi diff --git a/project/modules/ROOT/pages/objectives.adoc b/project/modules/ROOT/pages/objectives.adoc index 78d3d41..7bfa218 100644 --- a/project/modules/ROOT/pages/objectives.adoc +++ b/project/modules/ROOT/pages/objectives.adoc @@ -18,6 +18,28 @@ Of course, people need to be on board to do the actual work required — an Obje == Current Objectives +=== Fedora Lifecycle + +Summary:: +Rethink the Fedora release and lifecycle so the community can create new and forward-looking things with fewer bottlenecks. + +Objective Lead:: +https://fedoraproject.org/wiki/User:Pfrields[Paul Frields] + +Timeframe:: +Start planning during post-F29 release, with some changes starting to arrive as early as F30. + +Latest Status Report:: +2018-11: Objective approved by Council. More documentation coming soon. + +Objective Details:: +https://fedoraproject.org/wiki/Objectives/Lifecycle[Lifecycle] + +Documentation:: +https://fedoraproject.org/wiki/Objectives/Lifecycle[Lifecycle] + +''' + === Fedora Modularization — The Release image::modularity-badge.png[float="right"]