Skip to content

Commit facd90e

Browse files
committed
chore(cirrus): include fml files in docker image
1 parent 8b3bb29 commit facd90e

File tree

5 files changed

+58
-1
lines changed

5 files changed

+58
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ CIRRUS_COVERAGE_JSON := $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)unit__coverage.js
283283
CIRRUS_JUNIT_XML := $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)integration__results.xml
284284

285285
cirrus_build: build_megazords
286-
$(CIRRUS_ENABLE) $(DOCKER_BUILD) --target deploy -f cirrus/server/Dockerfile -t cirrus:deploy cirrus/server/
286+
$(CIRRUS_ENABLE) $(DOCKER_BUILD) --target deploy -f cirrus/server/Dockerfile -t cirrus:deploy --build-context=fml=experimenter/experimenter/features/manifests/ cirrus/server/
287287

288288
cirrus_build_test: build_megazords
289289
$(CIRRUS_ENABLE) $(COMPOSE_TEST) build cirrus

cirrus/server/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ COPY --from=python-builder /usr/local/bin /usr/local/bin
5151

5252
ENV PYTHONPATH=$PYTHONPATH:/application-services
5353

54+
# Copy fml files
55+
COPY --from=fml . /fml/
56+
5457
# Copy all other files into the container's working directory
5558
COPY . .
5659

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
version: 1.0.0
3+
about:
4+
description: Nimbus Feature Manifest for Experimenter Web testing
5+
channels:
6+
- dev
7+
features:
8+
example-feature:
9+
description: An example feature.
10+
variables:
11+
emoji:
12+
description: An emoji to show for this treatment.
13+
type: Option<String>
14+
default: ❤️
15+
enabled:
16+
description: If the feature is enabled.
17+
type: Boolean
18+
default: false
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
version: 1.0.0
3+
about:
4+
description: Nimbus Feature Manifest for Experimenter Web testing
5+
channels:
6+
- production
7+
features:
8+
example-feature:
9+
description: An example feature.
10+
variables:
11+
emoji:
12+
description: An emoji to show for this treatment.
13+
type: Option<String>
14+
default: ❤️
15+
enabled:
16+
description: If the feature is enabled.
17+
type: Boolean
18+
default: false
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
version: 1.0.0
3+
about:
4+
description: Nimbus Feature Manifest for Experimenter Web testing
5+
channels:
6+
- staging
7+
features:
8+
example-feature:
9+
description: An example feature.
10+
variables:
11+
emoji:
12+
description: An emoji to show for this treatment.
13+
type: Option<String>
14+
default: ;)
15+
enabled:
16+
description: If the feature is enabled.
17+
type: Boolean
18+
default: false

0 commit comments

Comments
 (0)