Skip to content

Commit a20af42

Browse files
lhotarisrinath-ctds
authored andcommitted
[fix][build] Fix building docker images without setting UBUNTU_MIRROR
- similar change was made in master as part of apache#22095 (cherry picked from commit c27bcf0) Conflicts: pom.xml
1 parent 4e10b22 commit a20af42

File tree

3 files changed

+31
-7
lines changed

3 files changed

+31
-7
lines changed

docker/pulsar/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@
4747
</dependency>
4848
</dependencies>
4949

50-
<properties>
51-
<UBUNTU_MIRROR>mirror://mirrors.ubuntu.com/mirrors.txt</UBUNTU_MIRROR>
52-
<UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
53-
</properties>
54-
5550
<profiles>
5651
<profile>
5752
<id>git-commit-id-no-git</id>

pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ flexible messaging model and an intuitive client API.</description>
8484

8585
<pulsar.client.python.version>3.4.0</pulsar.client.python.version>
8686

87+
<UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
88+
<UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
89+
8790
<!--config keys to configure test selection -->
8891
<include>**/Test*.java,**/*Test.java,**/*Tests.java,**/*TestCase.java</include>
8992
<exclude/>
@@ -2691,6 +2694,32 @@ flexible messaging model and an intuitive client API.</description>
26912694
</repository>
26922695
</distributionManagement>
26932696
</profile>
2697+
2698+
<profile>
2699+
<id>ubuntu-mirror-set</id>
2700+
<activation>
2701+
<property>
2702+
<name>env.UBUNTU_MIRROR</name>
2703+
</property>
2704+
</activation>
2705+
<properties>
2706+
<!-- Override the default value with the environment variable -->
2707+
<UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</UBUNTU_MIRROR>
2708+
</properties>
2709+
</profile>
2710+
<profile>
2711+
<id>ubuntu-security-mirror-set</id>
2712+
<activation>
2713+
<property>
2714+
<name>env.UBUNTU_SECURITY_MIRROR</name>
2715+
</property>
2716+
</activation>
2717+
<properties>
2718+
<!-- Override the default value with the environment variable -->
2719+
<UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</UBUNTU_SECURITY_MIRROR>
2720+
</properties>
2721+
</profile>
2722+
26942723
</profiles>
26952724

26962725
<repositories>

tests/docker-images/java-test-image/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<id>docker</id>
3636
<properties>
3737
<docker.buildArg.PULSAR_TARBALL>target/pulsar-server-distribution-bin.tar.gz</docker.buildArg.PULSAR_TARBALL>
38-
<docker.buildArg.UBUNTU_MIRROR>${env.UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
39-
<docker.buildArg.UBUNTU_SECURITY_MIRROR>${env.UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
38+
<docker.buildArg.UBUNTU_MIRROR>${UBUNTU_MIRROR}</docker.buildArg.UBUNTU_MIRROR>
39+
<docker.buildArg.UBUNTU_SECURITY_MIRROR>${UBUNTU_SECURITY_MIRROR}</docker.buildArg.UBUNTU_SECURITY_MIRROR>
4040
</properties>
4141
<activation>
4242
<property>

0 commit comments

Comments
 (0)