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

Issue 399 docker #171

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue 399 docker #171

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
659169f
add a new argument to the buildpkg.pl to set the ultrascan branch
samo38 Dec 19, 2024
276f934
edit the redhat and ubuntu dockerfiles to make sure that it checkouts…
samo38 Dec 19, 2024
56ddd5c
update redhat version to 8.10 and qt version to 5.15.16
samo38 Dec 20, 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
14 changes: 8 additions & 6 deletions admin/release/buildpkg.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,21 @@
"ubuntu:18.04" => "python"
,"ubuntu:20.04" => "python"
,"ubuntu:22.04" => "python3"
,"redhat:8.7" => "python3"
,"redhat:8.10" => "python3"
);

$snames = join( "\n", keys %supported );

$notes = "usage: $0 cores name
$notes = "usage: $0 cores name [branch]

where cores is the number of cores to use for parallel compilation

where name one of
where name is one of

$snames

where branch is the ultrascan branch (default: master)

what it does:

builds a container using podman if available of if not tries docker
Expand All @@ -40,6 +42,7 @@

$cores = shift || die $notes;
$image = shift || die $notes;
$branch = shift || "master";

# find a container manager

Expand All @@ -60,7 +63,7 @@

$cmd =
"cd $from"
. " && unbuffer $docker build -t $name --build-arg image=$bimage --build-arg apt_python_version=$supported{$image} --build-arg parallel_compile=$cores ."
. " && unbuffer $docker build -t $name --build-arg image=$bimage --build-arg apt_python_version=$supported{$image} --build-arg parallel_compile=$cores --build-arg ultrascan_branch=$branch ."
. " && id=\$($docker create $name)"
. " && $docker cp \$id:lastpkgname ../last.$name"
. " && $docker cp \$id:`cat ../last.$name` .."
Expand All @@ -71,11 +74,10 @@
$|=1;

print "-"x80 . "\n";
print "building release package for $bimage using $cores cores\n";
print "building release package for $bimage using $cores cores and branch $branch\n";
print "-"x80 . "\n";
print "$cmd\n";
print "-"x80 . "\n";
print `$cmd\n`;
print "-"x80 . "\n";


5 changes: 4 additions & 1 deletion admin/release/redhat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG ultrascan_branch=master

## qt defaults
ARG qt_major_version=5.15
ARG qt_version=5.15.8
ARG qt_version=5.15.16
ARG qwt_version=6.1.6
### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml

Expand Down Expand Up @@ -96,6 +96,9 @@ RUN wget https://versaweb.dl.sourceforge.net/project/qwt/qwt/$qwt_version/qwt-$q
## BRANCH could be pulled to top
ADD https://api.github.com/repos/ehb54/ultrascan3/git/refs/heads/$ultrascan_branch version.json
RUN git clone https://github.com/ehb54/ultrascan3.git
RUN cd $ULTRASCAN && git fetch --all
RUN cd $ULTRASCAN && git checkout -B $ultrascan_branch
RUN cd $ULTRASCAN && git reset --hard origin/$ultrascan_branch

# setup initial local.pri's

Expand Down
5 changes: 4 additions & 1 deletion admin/release/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG ultrascan_branch=master

## qt defaults
ARG qt_major_version=5.15
ARG qt_version=5.15.12
ARG qt_version=5.15.16
ARG qwt_version=6.1.6
### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml

Expand Down Expand Up @@ -90,6 +90,9 @@ RUN wget https://versaweb.dl.sourceforge.net/project/qwt/qwt/$qwt_version/qwt-$q
## BRANCH could be pulled to top
ADD https://api.github.com/repos/ehb54/ultrascan3/git/refs/heads/$ultrascan_branch version.json
RUN git clone https://github.com/ehb54/ultrascan3.git
RUN cd $ULTRASCAN && git fetch --all
RUN cd $ULTRASCAN && git checkout -B $ultrascan_branch
RUN cd $ULTRASCAN && git reset --hard origin/$ultrascan_branch

# setup initial local.pri's

Expand Down
Loading