Skip to content

Commit

Permalink
Merge branch 'v5.30' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
sni committed Feb 4, 2024
2 parents e786763 + 6135761 commit bf3e808
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 17 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,35 @@ jobs:
- omd-labs-debian
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to GitHub Docker Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: consol/${{ matrix.target }}:latest
platforms: linux/amd64,linux/arm64
- name: Build container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: ghcr.io/consol/omd-labs-docker/${{ matrix.target }}:latest
platforms: linux/amd64,linux/arm64
16 changes: 11 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,35 @@ jobs:
- omd-labs-debian
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to GitHub Docker Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: consol/${{ matrix.target }}:nightly
platforms: linux/amd64,linux/arm64
- name: Build container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: ghcr.io/consol/omd-labs-docker/${{ matrix.target }}:nightly
platforms: linux/amd64,linux/arm64
16 changes: 11 additions & 5 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,36 @@ jobs:
- omd-labs-debian
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- uses: nelonoel/branch-name@v1.0.1
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to GitHub Docker Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ env.BRANCH_NAME }}
tags: consol/${{ matrix.target }}:${{ env.BRANCH_NAME }}
platforms: linux/amd64,linux/arm64
- name: Build container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: ghcr.io/consol/omd-labs-docker/${{ matrix.target }}:${{ env.BRANCH_NAME }}
platforms: linux/amd64,linux/arm64
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Original Author: Simon Meggle

Each image build gets triggered by the OMD Labs build system as soon as there are new packages of OMD available:

* https://hub.docker.com/r/consol/omd-labs-rocky/
* https://hub.docker.com/r/consol/omd-labs-debian/
* https://hub.docker.com/r/consol/omd-labs-rocky/ (x86 / arm64)
* https://hub.docker.com/r/consol/omd-labs-debian/ (x86 / arm64)

Automated builds are triggered for the following branches:

Expand Down
4 changes: 4 additions & 0 deletions scripts/install_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ function install_common_debian() {
apt-get update
apt-get install -y procps

apt-get install -y locales
sed -i -r '/de_DE|en_US/s/^# *//' /etc/locale.gen
dpkg-reconfigure --frontend=noninteractive locales

echo 'net.ipv6.conf.default.disable_ipv6 = 1' > /etc/sysctl.d/20-ipv6-disable.conf
echo 'net.ipv6.conf.all.disable_ipv6 = 1' >> /etc/sysctl.d/20-ipv6-disable.conf
echo 'net.ipv6.conf.lo.disable_ipv6 = 1' >> /etc/sysctl.d/20-ipv6-disable.conf
Expand Down

0 comments on commit bf3e808

Please sign in to comment.