forked from opentripplanner/OpenTripPlanner
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #350 from HSLdevcom/fix_log_flooding
Fix log flooding
- Loading branch information
Showing
8 changed files
with
96 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
name: Process master push or pr | ||
on: | ||
push: | ||
branches: | ||
- master | ||
pull_request: | ||
branches: | ||
- master | ||
jobs: | ||
docker-push: | ||
if: github.ref == 'refs/heads/master' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
- name: Build docker image from master and push it | ||
run: ./.github/workflows/scripts/build_and_push_master.sh | ||
env: | ||
DOCKER_USER: ${{ secrets.DOCKER_USER }} | ||
DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Build prod from release | ||
on: | ||
release: | ||
types: | ||
- published | ||
jobs: | ||
prod-push: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
- name: Check Tag | ||
id: check-tag | ||
run: | | ||
if [[ ${GITHUB_REF##*/} =~ ^202[0-9][0-1][0-9][0-3][0-9]$ ]]; then | ||
echo ::set-output name=match::true | ||
fi | ||
- name: Push latest image as prod | ||
if: steps.check-tag.outputs.match == 'true' | ||
run: ./.github/workflows/scripts/push_prod.sh | ||
env: | ||
DOCKER_USER: ${{ secrets.DOCKER_USER }} | ||
DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
DOCKER_IMAGE="hsldevcom/opentripplanner" | ||
DOCKER_TAG="latest" | ||
|
||
COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA") | ||
|
||
DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH | ||
DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG | ||
DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG | ||
|
||
# Build image | ||
echo Building OTP | ||
docker build --tag="$DOCKER_IMAGE:builder" -f Dockerfile.builder . | ||
docker run --rm --entrypoint tar "$DOCKER_IMAGE:builder" -c target|tar x -C ./ | ||
docker build --tag="$DOCKER_IMAGE_TAG_LONG" -f Dockerfile . | ||
|
||
docker login -u $DOCKER_USER -p $DOCKER_AUTH | ||
echo "Pushing $DOCKER_TAG image" | ||
docker push $DOCKER_IMAGE_TAG_LONG | ||
docker tag $DOCKER_IMAGE_TAG_LONG $DOCKER_IMAGE_TAG | ||
docker push $DOCKER_IMAGE_TAG | ||
|
||
echo Build completed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
DOCKER_IMAGE="hsldevcom/opentripplanner" | ||
DOCKER_TAG="prod" | ||
|
||
COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA") | ||
|
||
DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH | ||
DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG | ||
DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG | ||
DOCKER_IMAGE_LATEST=$DOCKER_IMAGE:latest | ||
|
||
docker login -u $DOCKER_USER -p $DOCKER_AUTH | ||
|
||
echo "processing prod release" | ||
docker pull $DOCKER_IMAGE_LATEST | ||
docker tag $DOCKER_IMAGE_LATEST $DOCKER_IMAGE_TAG | ||
docker tag $DOCKER_IMAGE_LATEST $DOCKER_IMAGE_TAG_LONG | ||
docker push $DOCKER_IMAGE_TAG | ||
docker push $DOCKER_IMAGE_TAG_LONG | ||
|
||
echo Build completed |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.