Skip to content

Commit 67aa584

Browse files
authored
Fix build issues with production Dockerfiles + taskcluster; add CI test for docker builds. (#1033)
1 parent df6ffa8 commit 67aa584

File tree

5 files changed

+46
-4
lines changed

5 files changed

+46
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cef.log
1111
.swp
1212
*.egg-info
1313
.pytest_cache
14+
pip-wheel-metadata
1415

1516
build
1617
generated

.taskcluster.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,48 @@ tasks:
146146
owner: ${owner_email}
147147
source: ${repo_url}
148148

149+
- taskId: {$eval: as_slugid("agent-docker-build")}
150+
created: {$fromNow: ''}
151+
deadline: {$fromNow: '2 hours'}
152+
provisionerId: aws-provisioner-v1
153+
workerType: github-worker
154+
routes: []
155+
payload:
156+
maxRunTime: 3600
157+
image: "taskcluster/image_builder:0.1.3"
158+
command:
159+
- "/bin/bash"
160+
- "-c"
161+
- "git clone ${repo_url} balrog && cd balrog && git checkout ${head_sha} && cd agent && docker build ."
162+
features:
163+
dind: true
164+
metadata:
165+
name: Balrog agent docker build
166+
description: Balrog agent docker build
167+
owner: ${owner_email}
168+
source: ${repo_url}
169+
170+
- taskId: {$eval: as_slugid("backend-docker-build")}
171+
created: {$fromNow: ''}
172+
deadline: {$fromNow: '2 hours'}
173+
provisionerId: aws-provisioner-v1
174+
workerType: github-worker
175+
routes: []
176+
payload:
177+
maxRunTime: 3600
178+
image: "taskcluster/image_builder:0.1.3"
179+
command:
180+
- "/bin/bash"
181+
- "-c"
182+
- "git clone ${repo_url} balrog && cd balrog && git checkout ${head_sha} && docker build ."
183+
features:
184+
dind: true
185+
metadata:
186+
name: Balrog backend docker build
187+
description: Balrog backend docker build
188+
owner: ${owner_email}
189+
source: ${repo_url}
190+
149191
- taskId: {$eval: as_slugid("old-ui-tests")}
150192
created: {$fromNow: ''}
151193
deadline: {$fromNow: '2 hours'}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ COPY src/ /app/src/
2929
COPY ui/ /app/ui/
3030
COPY uwsgi/ /app/uwsgi/
3131
COPY scripts/manage-db.py scripts/run-batch-deletes.sh scripts/run.sh scripts/reset-stage-db.sh scripts/get-prod-db-dump.py /app/scripts/
32-
COPY version.json /app/
32+
COPY setup.py version.json version.txt /app/
3333

3434
RUN python setup.py install
3535

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include LICENSE
22
include pyproject.toml
3+
include setup.py
34
include tox.ini
45
include version.txt
56

agent/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
ARG PYTHON_VERSION
2-
3-
FROM python:${PYTHON_VERSION}-stretch
1+
FROM python:3.7-stretch
42

53
64

0 commit comments

Comments
 (0)