humblec · Jan 23, 2020 · Aug 14, 2020 · Jul 5, 2022 · Jul 7, 2022 · Jul 7, 2022
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -0,0 +1,64 @@
+name: Build and release Docker images
+
+on:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "CentOS/**"
+      - "Fedora/**"
+
+env:
+  REGISTRY: ghcr.io
+  USER: ${{ github.actor }} # The GitHub user
+  PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+  IMAGE_NAME: ${{ github.repository }} # xlates to <username>/<repo>
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the current repo
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Run the tests
+      - name: Run linter tests
+        run: |
+          sudo apt install shellcheck
+          sudo npm install -g dockerfile_lint
+          make
+
+      # Login to GitHub package registry with Docker
+      - name: Login to package registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.USER }}
+          password: ${{ env.PASSWORD }}
+
+      # Set up QEMU (multi-platform)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      # Set up Docker buildx (multi-platform)
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      # Build and push CentOS image
+      - name: Build and push CentOS image for amd64 and arm64
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          context: ./CentOS
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:centos,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          platforms: linux/amd64,linux/arm64
+
+      # Build and push Fedora image
+      - name: Build and push Fedora image for amd64 and arm64
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          context: ./Fedora
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:fedora
+          platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/lint-and-test-on-comment.yml b/.github/workflows/lint-and-test-on-comment.yml
@@ -0,0 +1,39 @@
+name: Linter and Container tests
+
+on:
+  issue_comment:
+    branches:
+      - "master"
+    types:
+      - "created"
+      - "edited"
+      - "deleted"
+
+jobs:
+  lint_and_test:
+    if: |
+      contains(github.event.comment.html_url, '/pull/') &&
+      contains(github.event.comment.body, '/test')
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the current repo
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Prepare the runner
+      - name: Prepare the runner
+        run: |
+          sudo apt install shellcheck
+          sudo npm install -g dockerfile_lint
+
+      # Run the linter tests
+      - name: Run linter tests
+        run: make
+
+      # Run the container tests for CentOS
+      - name: Run CentOS container tests
+        run: tests/container-tests.sh centos
+
+      # Run the container tests for Fedora
+      - name: Run Fedora container tests
+        run: tests/container-tests.sh fedora
diff --git a/.github/workflows/lint-and-test-pr.yml b/.github/workflows/lint-and-test-pr.yml
@@ -0,0 +1,32 @@
+name: Linter and Container tests
+
+on:
+  pull_request:
+    branches:
+      - "master"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the current repo
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Prepare the runner
+      - name: Prepare the runner
+        run: |
+          sudo apt install shellcheck
+          sudo npm install -g dockerfile_lint
+
+      # Run the linter tests
+      - name: Run linter tests
+        run: make
+
+      # Run the container tests for CentOS
+      - name: Run CentOS container tests
+        run: tests/container-tests.sh centos
+
+      # Run the container tests for Fedora
+      - name: Run Fedora container tests
+        run: tests/container-tests.sh fedora
diff --git a/.travis.yml b/.travis.yml
diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM quay.io/centos/centos:stream9
 
 MAINTAINER Humble Chirammal hchiramm@redhat.com Saravanakumar Arumugam sarumuga@redhat.com
 
@@ -15,7 +15,7 @@ LABEL architecture="$ARCH" \
       description="Gluster Image is based on CentOS Image which is a scalable network filesystem. Using common off-the-shelf hardware, you can create large, distributed storage solutions for media streaming, data analysis, and other data- and bandwidth-intensive tasks." \
       io.openshift.tags="gluster,glusterfs,glusterfs-centos"
 
-RUN yum --setopt=tsflags=nodocs -y update && yum install -y centos-release-gluster && yum clean all && \
+RUN dnf --nodocs -y update && dnf --nodocs -y install centos-release-gluster && \
 (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done) && \
 rm -f /lib/systemd/system/multi-user.target.wants/* &&\
 rm -f /etc/systemd/system/*.wants/* &&\
@@ -24,21 +24,21 @@ rm -f /lib/systemd/system/sockets.target.wants/*udev* && \
 rm -f /lib/systemd/system/sockets.target.wants/*initctl* && \
 rm -f /lib/systemd/system/basic.target.wants/* &&\
 rm -f /lib/systemd/system/anaconda.target.wants/* &&\
-yum --setopt=tsflags=nodocs -y install nfs-utils && \
-yum --setopt=tsflags=nodocs -y install attr  && \
-yum --setopt=tsflags=nodocs -y install iputils  && \
-yum --setopt=tsflags=nodocs -y install iproute  && \
-yum --setopt=tsflags=nodocs -y install openssh-server  && \
-yum --setopt=tsflags=nodocs -y install openssh-clients  && \
-yum --setopt=tsflags=nodocs -y install rsync  && \
-yum --setopt=tsflags=nodocs -y install tar  && \
-yum --setopt=tsflags=nodocs -y install cronie  && \
-yum --setopt=tsflags=nodocs -y install xfsprogs  && \
-yum --setopt=tsflags=nodocs -y install glusterfs  && \
-yum --setopt=tsflags=nodocs -y install glusterfs-server  && \
-yum --setopt=tsflags=nodocs -y install glusterfs-rdma  && \
-yum --setopt=tsflags=nodocs -y install gluster-block  && \
-yum --setopt=tsflags=nodocs -y install glusterfs-geo-replication && yum clean all && \
+dnf --nodocs -y install nfs-utils && \
+dnf --nodocs -y install attr  && \
+dnf --nodocs -y install iputils  && \
+dnf --nodocs -y install iproute  && \
+dnf --nodocs -y install openssh-server  && \
+dnf --nodocs -y install openssh-clients  && \
+dnf --nodocs -y install rsync  && \
+dnf --nodocs -y install tar  && \
+dnf --nodocs -y install cronie  && \
+dnf --nodocs -y install xfsprogs  && \
+dnf --nodocs -y install glusterfs  && \
+dnf --nodocs -y install glusterfs-server  && \
+dnf --nodocs -y install glusterfs-rdma  && \
+dnf --nodocs -y install gluster-block  && \
+dnf --nodocs -y install glusterfs-geo-replication && dnf clean all && \
 sed -i '/Port 22/c\Port 2222' /etc/ssh/sshd_config && \
 sed -i 's/Requires\=rpcbind\.service//g' /usr/lib/systemd/system/glusterd.service && \
 sed -i 's/rpcbind\.service/gluster-setup\.service/g' /usr/lib/systemd/system/glusterd.service && \
@@ -89,35 +89,14 @@ RUN true \
 
 
 VOLUME [ "/sys/fs/cgroup" ]
-ADD gluster-fake-disk.service /etc/systemd/system/gluster-fake-disk.service
-ADD fake-disk.sh /usr/libexec/gluster/fake-disk.sh
-ADD gluster-setup.service /etc/systemd/system/gluster-setup.service
-ADD gluster-setup.sh /usr/sbin/gluster-setup.sh
-ADD gluster-block-setup.service /etc/systemd/system/gluster-block-setup.service
-ADD gluster-block-setup.sh /usr/sbin/gluster-block-setup.sh
-ADD update-params.sh /usr/local/bin/update-params.sh
-ADD status-probe.sh /usr/local/bin/status-probe.sh
-ADD tcmu-runner-params /etc/sysconfig/tcmu-runner-params
-ADD gluster-check-diskspace.service  /etc/systemd/system/gluster-check-diskspace.service
-ADD check_diskspace.sh /usr/local/bin/check_diskspace.sh
-ADD exec-on-host.sh /usr/sbin/exec-on-host
 
-RUN chmod 644 /etc/systemd/system/gluster-setup.service && \
-chmod 644 /etc/systemd/system/gluster-check-diskspace.service && \
-chmod 755 /usr/libexec/gluster/fake-disk.sh && \
-chmod 500 /usr/sbin/gluster-setup.sh && \
-chmod 644 /etc/systemd/system/gluster-block-setup.service && \
-chmod 500 /usr/sbin/gluster-block-setup.sh && \
-chmod +x /usr/local/bin/update-params.sh && \
-chmod +x /usr/local/bin/status-probe.sh && \
-chmod +x /usr/local/bin/check_diskspace.sh && \
-systemctl disable nfs-server.service && \
-systemctl enable gluster-fake-disk.service && \
-systemctl enable gluster-setup.service && \
-systemctl enable gluster-block-setup.service && \
-systemctl enable gluster-blockd.service && \
-systemctl enable glusterd.service && \
-systemctl enable gluster-check-diskspace.service
+COPY . /tmp/container-setup
+RUN true \
+    && cd /tmp/container-setup \
+    && ./setup-services.sh \
+    && cd - \
+    && rm -rf /tmp/container-setup \
+    && true
 
 EXPOSE 2222 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162
 

diff --git a/CentOS/setup-services.sh b/CentOS/setup-services.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# verbose and exit on error
+set -ex
+
+# Copy files to required locations
+cp gluster-fake-disk.service /etc/systemd/system/gluster-fake-disk.service
+mkdir -p /usr/libexec/gluster
+cp fake-disk.sh /usr/libexec/gluster/fake-disk.sh
+cp gluster-setup.service /etc/systemd/system/gluster-setup.service
+cp gluster-setup.sh /usr/sbin/gluster-setup.sh
+cp gluster-block-setup.service /etc/systemd/system/gluster-block-setup.service
+cp gluster-block-setup.sh /usr/sbin/gluster-block-setup.sh
+cp update-params.sh /usr/local/bin/update-params.sh
+cp status-probe.sh /usr/local/bin/status-probe.sh
+cp tcmu-runner-params /etc/sysconfig/tcmu-runner-params
+cp gluster-check-diskspace.service  /etc/systemd/system/gluster-check-diskspace.service
+cp check_diskspace.sh /usr/local/bin/check_diskspace.sh
+cp exec-on-host.sh /usr/sbin/exec-on-host
+
+
+# Set required bits
+chmod 644 /etc/systemd/system/gluster-setup.service
+chmod 644 /etc/systemd/system/gluster-check-diskspace.service
+chmod 755 /usr/libexec/gluster/fake-disk.sh
+chmod 500 /usr/sbin/gluster-setup.sh
+chmod 644 /etc/systemd/system/gluster-block-setup.service
+chmod 500 /usr/sbin/gluster-block-setup.sh
+chmod +x /usr/local/bin/update-params.sh
+chmod +x /usr/local/bin/status-probe.sh
+chmod +x /usr/local/bin/check_diskspace.sh
+
+# Bootstrap services
+systemctl disable nfs-server.service
+systemctl enable gluster-fake-disk.service
+systemctl enable gluster-setup.service
+systemctl enable gluster-block-setup.service
+systemctl enable gluster-blockd.service
+systemctl enable glusterd.service
+systemctl enable gluster-check-diskspace.service
diff --git a/CentOS/update-params.sh b/CentOS/update-params.sh
@@ -10,6 +10,23 @@
 : ${TCMU_LOCKDIR:=/var/run/lock}
 
 set_cgroup_pids() {
+  # Check if system is using unified cgroups i.e. v2
+  # We can cat /proc/filesystems, it'll have an entry for cgroups v2
+  # But systemd already does this for us, so we can just query it.
+  cgroupVer=$(systemctl show -all | grep -o "default-hierarchy.*" | cut -d '=' -f2)
+
+  # Call relevant functions, v2 is for unified, v1 is for legacy cgroups
+  if [[ "${cgroupVer}" == "unified" ]]
+  then
+    echo "Systemd is using unified cgroups(v2)"
+    set_cgroup_pids_v2 $1
+  else
+    echo "Systemd is using legacy cgroups(v1)"
+    set_cgroup_pids_v1 $1
+  fi
+}
+
+set_cgroup_pids_v1() {
   local ret=0
   local pids=$1
   local cgroup max
@@ -28,6 +45,25 @@ set_cgroup_pids() {
   return ${ret}
 }
 
+set_cgroup_pids_v2() {
+  local ret=0
+  local pids=$1
+  local cgroup max
+
+  cgroup=$(awk -F: '{print $3}' /proc/self/cgroup)
+
+  max=$(cat /sys/fs/cgroup/"${cgroup}"/pids.max)
+  echo "maximum number of pids configured in cgroups: ${max}"
+
+  echo "${pids}" > /sys/fs/cgroup/"${cgroup}"/pids.max
+  ret=$?
+
+  max=$(cat /sys/fs/cgroup/"${cgroup}"/pids.max)
+  echo "maximum number of pids configured in cgroups (reconfigured): ${max}"
+
+  return ${ret}
+}
+
 # do not change cgroup/pids when CGROUP_PIDS_MAX is set to 0
 if [[ "${CGROUP_PIDS_MAX}" != '0' ]]
 then