Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/MirrorCache/Datamodule.pm
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ sub _init_location($self) {
my $p = $query->param('AVOID_COUNTRY');
my @avoid_countries = ();
@avoid_countries = ('by', 'ru') if $sanctioned_countries->{$country};
@avoid_countries = ('ua') if $country eq 'ru' || $country eq 'by';
if ($p) {
for my $c (split ',', $p) {
next unless length($c) == 2;
Expand Down
4 changes: 3 additions & 1 deletion t/lib/Dockerfile.environ.mariadb.experimental
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ ENV container docker
ENV LANG en_US.UTF-8

RUN zypper -n in curl # rpm --import needs curl atm
RUN curl -IL https://mirror.mariadb.org/yum/11.8/sles15-amd64/repodata/repomd.xml
RUN zypper ar -f http://cdn.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.6 mc
RUN zypper ar -f https://mirror.mariadb.org/yum/11.4/sles15-amd64 mariadb
# RUN zypper ar -f https://mirror.mariadb.org/yum/11.8/sles15-amd64 mariadb
RUN zypper ar -f https://mirror.netcologne.de/mariadb/mariadb-11.8.8/yum/sles/15.7/x86_64 mariadb
RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
RUN zypper --gpg-auto-import-keys ref

Expand Down
Loading