Skip to content

Commit 95beefa

Browse files
authored
Fix local dockerfiles + add ARM support + allow staging sys addon releases (#2428)
* Fix failed to load metadata for repo 'appstream' error * Fix missing C++ compiler when builing wheel for brotli * Specify platform to build docker images based on the mysql image on machines with ARM chips (i.e. Apple M1) * Allow system addons to point at staging blobs in staging and locally * exclude docker-compose.arm.yml in MANIFEST.in
1 parent ab9050e commit 95beefa

File tree

6 files changed

+25
-2
lines changed

6 files changed

+25
-2
lines changed

Dockerfile.nginx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM openresty/openresty:centos
22

3+
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* &&\
4+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-*
5+
36
# netcat is used to listen to the ports.
47

58
RUN yum install -y nmap-ncat

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MAINTAINER [email protected]
1313
# xz-utils is needed to unpack sampled ata
1414
# git is needed to send coverage reports
1515
RUN apt-get -q update \
16-
&& apt-get -q --yes install netcat libpcre3 libpcre3-dev default-libmysqlclient-dev mariadb-client curl gcc xz-utils git \
16+
&& apt-get -q --yes install g++ netcat libpcre3 libpcre3-dev default-libmysqlclient-dev mariadb-client curl gcc xz-utils git \
1717
&& apt-get clean
1818

1919
WORKDIR /app

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ exclude agent
2020
exclude client
2121
exclude docs
2222
exclude docker-compose.yml
23+
exclude docker-compose.arm.yml
2324
exclude requirements
2425
exclude scripts
2526
exclude tests

README.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ Run the following command to create and run the necessary containers:
1818

1919
$ docker-compose up
2020

21+
**Note**
22+
23+
*On ARM (M1) chips*
24+
25+
Make sure you are running a recent version of docker compose:
26+
::
27+
28+
$ docker-compose version
29+
Docker Compose version v2.2.3
30+
31+
Then, run the following command to create and run the necessary containers:
32+
::
33+
34+
$ docker-compose -f docker-compose.yml -f docker-compose.arm.yml up
35+
2136
Once it completes, you should be able to access
2237

2338
- http://localhost:9010 - The public API

docker-compose.arm.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: '2.4'
2+
services:
3+
balrogdb:
4+
platform: linux/amd64

uwsgi/admin.wsgi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if STAGING or LOCALDEV:
3434
SYSTEM_ACCOUNTS.extend(["balrog-stage-ffxbld", "balrog-stage-tbirdbld"])
3535
DOMAIN_ALLOWLIST.update(
3636
{
37-
"ftp.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild"),
37+
"ftp.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild", "SystemAddons"),
3838
"bouncer-bouncer-releng.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild"),
3939
"stage.guardian.nonprod.cloudops.mozgcp.net": ("FirefoxVPN", "Guardian"),
4040
"stage-vpn.guardian.nonprod.cloudops.mozgcp.net": ("FirefoxVPN", "Guardian"),

0 commit comments

Comments
 (0)