Skip to content

Commit

Permalink
Fix local dockerfiles + add ARM support + allow staging sys addon rel…
Browse files Browse the repository at this point in the history
…eases (#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
  • Loading branch information
gabrielBusta committed Feb 8, 2022
1 parent ab9050e commit 95beefa
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Dockerfile.nginx
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM openresty/openresty:centos

RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* &&\
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-*

# netcat is used to listen to the ports.

RUN yum install -y nmap-ncat
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ MAINTAINER bhearsum@mozilla.com
# xz-utils is needed to unpack sampled ata
# git is needed to send coverage reports
RUN apt-get -q update \
&& apt-get -q --yes install netcat libpcre3 libpcre3-dev default-libmysqlclient-dev mariadb-client curl gcc xz-utils git \
&& apt-get -q --yes install g++ netcat libpcre3 libpcre3-dev default-libmysqlclient-dev mariadb-client curl gcc xz-utils git \
&& apt-get clean

WORKDIR /app
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ exclude agent
exclude client
exclude docs
exclude docker-compose.yml
exclude docker-compose.arm.yml
exclude requirements
exclude scripts
exclude tests
Expand Down
15 changes: 15 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@ Run the following command to create and run the necessary containers:

$ docker-compose up

**Note**

*On ARM (M1) chips*

Make sure you are running a recent version of docker compose:
::

$ docker-compose version
Docker Compose version v2.2.3

Then, run the following command to create and run the necessary containers:
::

$ docker-compose -f docker-compose.yml -f docker-compose.arm.yml up

Once it completes, you should be able to access

- http://localhost:9010 - The public API
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.arm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: '2.4'
services:
balrogdb:
platform: linux/amd64
2 changes: 1 addition & 1 deletion uwsgi/admin.wsgi
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if STAGING or LOCALDEV:
SYSTEM_ACCOUNTS.extend(["balrog-stage-ffxbld", "balrog-stage-tbirdbld"])
DOMAIN_ALLOWLIST.update(
{
"ftp.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild"),
"ftp.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild", "SystemAddons"),
"bouncer-bouncer-releng.stage.mozaws.net": ("Firefox", "Fennec", "Devedition", "SeaMonkey", "Thunderbird", "Pinebuild"),
"stage.guardian.nonprod.cloudops.mozgcp.net": ("FirefoxVPN", "Guardian"),
"stage-vpn.guardian.nonprod.cloudops.mozgcp.net": ("FirefoxVPN", "Guardian"),
Expand Down

0 comments on commit 95beefa

Please sign in to comment.