Skip to content

Commit 3ec3769

Browse files
authored
Update rpm package test environment (#100)
* Use AlmaLinux instead of CentOS for rpm package test CentOS is EOL. Signed-off-by: Daijiro Fukuda <[email protected]> * Fix README about CentOS Since CentOS is EOL now, we should replace the description about CentOS with another RHEL compatible OS. Signed-off-by: Daijiro Fukuda <[email protected]> --------- Signed-off-by: Daijiro Fukuda <[email protected]>
1 parent 9ffe8e1 commit 3ec3769

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: docker/build-push-action@v2
2121
with:
2222
file: test/docker/Dockerfile.ubuntu
23-
tdagent:
23+
tdagent-deb:
2424
runs-on: ubuntu-latest
2525
steps:
2626
-
@@ -34,7 +34,7 @@ jobs:
3434
uses: docker/build-push-action@v2
3535
with:
3636
file: test/docker/Dockerfile.tdagent-ubuntu
37-
centos:
37+
tdagent-rpm:
3838
runs-on: ubuntu-latest
3939
steps:
4040
-
@@ -47,7 +47,7 @@ jobs:
4747
id: docker_build
4848
uses: docker/build-push-action@v2
4949
with:
50-
file: test/docker/Dockerfile.tdagent-centos
50+
file: test/docker/Dockerfile.tdagent-almalinux
5151
rubocop:
5252
runs-on: ubuntu-latest
5353
steps:

.github/workflows/pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: docker/build-push-action@v2
1919
with:
2020
file: test/docker/Dockerfile.ubuntu
21-
tdagent:
21+
tdagent-deb:
2222
runs-on: ubuntu-latest
2323
steps:
2424
-
@@ -32,7 +32,7 @@ jobs:
3232
uses: docker/build-push-action@v2
3333
with:
3434
file: test/docker/Dockerfile.tdagent-ubuntu
35-
centos:
35+
tdagent-rpm:
3636
runs-on: ubuntu-latest
3737
steps:
3838
-
@@ -45,7 +45,7 @@ jobs:
4545
id: docker_build
4646
uses: docker/build-push-action@v2
4747
with:
48-
file: test/docker/Dockerfile.tdagent-centos
48+
file: test/docker/Dockerfile.tdagent-almalinux
4949
rubocop:
5050
runs-on: ubuntu-latest
5151
steps:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ On Debian or Ubuntu you might need to install the libsystemd0 package:
212212
apt-get install libsystemd0
213213
```
214214

215-
On CentOS or RHEL you might need to install the systemd package:
215+
On AlmaLinux or RHEL you might need to install the systemd package:
216216

217217
```
218218
yum install -y systemd
219219
```
220220

221-
If you want to do this in a CentOS docker image you might first need to remove the `fakesystemd` package.
221+
If you want to do this in a AlmaLinux docker image you might first need to remove the `fakesystemd` package.
222222

223223
```
224224
yum remove -y fakesystemd

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ task build: 'docker:test'
1616
task default: :rubocop
1717

1818
namespace :docker do
19-
distros = %i[ubuntu tdagent-ubuntu tdagent-centos]
19+
distros = %i[ubuntu tdagent-ubuntu tdagent-almalinux]
2020
task test: distros
2121

2222
distros.each do |distro|
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM centos:8
1+
FROM almalinux:9
22

33
RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent \
44
&& printf "[treasuredata]\nname=TreasureData\nbaseurl=http://packages.treasuredata.com/4/redhat/\$releasever/\$basearch\ngpgcheck=1\ngpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent\n" > /etc/yum.repos.d/td.repo \
5-
&& yum install -y td-agent make gcc-c++ systemd
5+
&& dnf install -y td-agent make gcc-c++ systemd
66

77
ENV PATH /opt/td-agent/bin/:$PATH
88
RUN td-agent-gem install bundler

0 commit comments

Comments
 (0)