diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-03-18 19:51:19 +0100 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-03-18 19:56:04 +0100 |
| commit | 7421a329ec3850f18f0e5ecb09afbd83fc5a140f (patch) | |
| tree | c9923268694cc2742bf08eca4020f75fa8191f69 | |
| parent | a1f221ad7bdb20ce0f498e52c1556a4cfbbdeb87 (diff) | |
| download | bugzilla-7421a329ec3850f18f0e5ecb09afbd83fc5a140f.tar.gz bugzilla-7421a329ec3850f18f0e5ecb09afbd83fc5a140f.tar.xz | |
switch build stuff to harmony fork
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | t/docker.t | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a2c62e82..44cd514af 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ main_filters: &main_filters defaults: bmo_slim_image: &bmo_slim_image - image: mozillabteam/bmo-slim:20180225.1 + image: bugzilla/harmony-slim:20180318.1 user: app mysql_image: &mysql_image @@ -93,6 +93,8 @@ jobs: TAG="$CIRCLE_TAG" elif [[ "$CIRCLE_BRANCH" == "master" ]]; then TAG=latest + elif [[ "$CIRCLE_BRANCH" == "unstable" ]]; then + TAG=unstable fi if [[ -n "$TAG" ]]; then docker tag bmo "$DOCKERHUB_REPO:$TAG" diff --git a/Dockerfile b/Dockerfile index ac101bb94..dd0350cd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM mozillabteam/bmo-slim:20180225.1 - +FROM bugzilla/harmony-slim:20180318.1 ARG CI ARG CIRCLE_SHA1 diff --git a/t/docker.t b/t/docker.t index 3c8cd055b..c1f85088c 100644 --- a/t/docker.t +++ b/t/docker.t @@ -28,7 +28,7 @@ while (my $line = readline $dockerfile_fh) { close $dockerfile_fh; my ($image, $version) = split(/:/ms, $base, 2); -is($image, 'mozillabteam/bmo-slim', "base image is mozillabteam/bmo-slim"); +is($image, 'bugzilla/harmony-slim', "base image is bugzilla/harmony-slim"); like($version, qr/\d{4}\d{2}\d{2}\.\d+/ms, "version is YYYYMMDD.x"); my $regex = qr{ @@ -49,4 +49,4 @@ while (my $line = readline $ci_config_fh) { } close $ci_config_fh; -done_testing;
\ No newline at end of file +done_testing; |