Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💥 Switch to Oracle Linux #46

Merged
merged 3 commits into from
Jun 5, 2024
Merged

💥 Switch to Oracle Linux #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00079a9
💥 Switch to Oracle Linux
twink0r Jun 5, 2024
40eec27
💥 Switch from centos:6 to oraclelinux:6.10
twink0r Jun 5, 2024
27c19b6
🚨 Fix linter
twink0r Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions docker-build/Dockerfile.centos-6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
FROM centos:6

# see https://www.getpagespeed.com/server-setup/how-to-fix-yum-after-centos-6-went-eol
COPY ./docker-build/centos6-eol.repo /etc/yum.repos.d/CentOS-Base.repo
FROM oraclelinux:6.10

# hadolint ignore=DL3033
RUN yum install -y findutils rpm-build rpm-sign dos2unix rpmdevtools && yum clean all
Expand Down
4 changes: 2 additions & 2 deletions docker-build/Dockerfile.centos-7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM centos:7
FROM oraclelinux:7.9

# hadolint ignore=DL3033
RUN yum install -y findutils rpm-build rpm-sign dos2unix && yum clean all

# hadolint ignore=SC2039
# hadolint ignore=SC2039,SC3009
RUN mkdir -p /rpmbuild/{SPECS,SOURCES,BUILD,BUILDROOT,RPMS,SRPMS}

COPY ./docker-build/rpmbuild.sh /
Expand Down
4 changes: 2 additions & 2 deletions docker-build/Dockerfile.centos-8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM quay.io/centos/centos:stream8
FROM oraclelinux:8.10

# hadolint ignore=DL3041
RUN dnf install -y findutils rpm-build rpm-sign dos2unix && dnf clean all

# hadolint ignore=SC2039
# hadolint ignore=SC2039,SC3009
RUN mkdir -p /rpmbuild/{SPECS,SOURCES,BUILD,BUILDROOT,RPMS,SRPMS}

COPY ./docker-build/rpmbuild.sh /
Expand Down
4 changes: 2 additions & 2 deletions docker-build/Dockerfile.centos-9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM quay.io/centos/centos:stream9
FROM oraclelinux:9

# hadolint ignore=DL3041
RUN dnf install -y findutils rpm-build rpm-sign dos2unix && dnf clean all

# hadolint ignore=SC2039
# hadolint ignore=SC2039,SC3009
RUN mkdir -p /rpmbuild/{SPECS,SOURCES,BUILD,BUILDROOT,RPMS,SRPMS}

COPY ./docker-build/rpmbuild.sh /
Expand Down
40 changes: 0 additions & 40 deletions docker-build/centos6-eol.repo
View file
Open in desktop

This file was deleted.