Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1936911 - Add back CIRCLECI_SHA1 AND CIRCLE_BUILD_URL back to the build and deploy steps for CircleCI #2372

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Bug 1936911 - Add back CIRCLECI_SHA1 AND CIRCLE_BUILD_URL back to the build and deploy steps for CircleCI #2372

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d8e142
Bug 1936911 - Add back CIRCLECI_SHA1 AND CIRCLE_BUILD_URL back to the…
dklawren Dec 12, 2024
e577a1d
Separate docker compose build step with build-args
dklawren Dec 13, 2024
f21a48b
Removed CI=1 build arg as not needed like I originally thought
dklawren Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ jobs:
- run:
name: build version.json and push data
command: |
docker-compose -f docker-compose.test.yml run --build --name push_data bmo.test push_data
docker-compose build --build-arg CIRCLE_SHA1="$CIRCLE_SHA1" --build-arg CIRCLE_BUILD_URL="$CIRCLE_BUILD_URL" bmo.test
docker-compose run --name push_data bmo.test push_data
docker cp push_data:/app/push_data/blog.push.txt build_info/blog.push.txt
docker cp push_data:/app/push_data/markdown.push.txt build_info/markdown.push.txt
docker cp push_data:/app/push_data/bug.push.txt build_info/bug.push.txt
Expand Down Expand Up @@ -109,7 +110,8 @@ jobs:
- deploy:
command: |
[[ -n "$DOCKERHUB_REPO" && -n "$DOCKER_USER" && -n "$DOCKER_PASS" ]] || exit 0
docker build --tag bmo --target base .
docker build --build-arg CIRCLE_SHA1="$CIRCLE_SHA1" --build-arg CIRCLE_BUILD_URL="$CIRCLE_BUILD_URL" \
--tag bmo --target base .
if [[ "$CIRCLE_BRANCH" == "master" ]]; then
TAG="$(cat build_info/tag.txt)"
if [[ -n "$TAG" && -f build_info/publish.txt ]]; then
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ services:
context: .
dockerfile: Dockerfile
target: test
args:
- CI=1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised we need to set this and CircleCI doesn't set this when appropriate on its own?

command: dev_httpd
tmpfs:
- /tmp
Expand Down
Loading