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

Dockerfile: "master" branches are now called "main" #371

Merged
merged 2 commits into from
Dec 9, 2024
+6 −4
Merged

Dockerfile: "master" branches are now called "main" #371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a035d9f
Dockerfile: "master" branches are now called "main"
jrha Dec 6, 2024
8173ca6
Dockerfile: Use 23.6.0 version of perl-Test-Quattor
jrha Dec 6, 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
10 changes: 6 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ FROM rockylinux:8
WORKDIR /quattor

# install library core in /quattor, tests need it
ADD https://codeload.github.com/quattor/template-library-core/tar.gz/master template-library-core-master.tar.gz
RUN tar -xzf template-library-core-master.tar.gz
ADD https://codeload.github.com/quattor/template-library-core/tar.gz/main template-library-core-main.tar.gz
RUN tar -xzf template-library-core-main.tar.gz

# point library core to where we downloaded it
ENV QUATTOR_TEST_TEMPLATE_LIBRARY_CORE /quattor/template-library-core-master
ENV QUATTOR_TEST_TEMPLATE_LIBRARY_CORE /quattor/template-library-core-main

# Prepare to install dependencies
RUN dnf -y install dnf-plugins-core && \
Expand All @@ -28,7 +28,9 @@ RUN dnf install -y maven which rpm-build panc ncm-lib-blockdevices \
perl-Net-OpenStack-Client perl-NetAddr-IP perl-REST-Client \
perl-Set-Scalar perl-Text-Glob cpanminus gcc wget \
perl-Git-Repository perl-Data-Structure-Util \
perl-Test-Quattor aii-ks procps-ng rpm-build
aii-ks procps-ng rpm-build

RUN dnf install -y http://yum.quattor.org/23.6.0/el8/perl-Test-Quattor-23.6.0-1.noarch.rpm

# quattor tests should not be run as root
RUN useradd --user-group --create-home --no-log-init --home-dir /quattor_test quattortest
Expand Down
Loading