Skip to content

Commit

Permalink
Merge branch 'develop' into OPS-10254-config-in-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
lazysoundsystem authored Jun 24, 2024
2 parents 09fcb77 + b051ec5 commit 48fdb42
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 74 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/docker-build-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build docker image

on:
# Set a correct docker_image variable and then remove the comments from this block to enable automagic builds.
# push:
# branches:
# - develop
# - 'feature/**'
# - main
# release:
# types: [published]

jobs:
build:
runs-on: ubuntu-latest
steps:

- name: Build
id: build-action
uses: UN-OCHA/actions/drupal-docker-build@main
with:
aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
docker_registry_url: public.ecr.aws
docker_registry_path: /unocha/
docker_image: web-site
docker_username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
docker_password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
ecr_github_token: ${{ secrets.ECR_GITHUB_TOKEN }}
ecr_jenkins_token: ${{ secrets.JENKINS_ECR_TOKEN }}
slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
slack_channel_name: ${{ vars.SLACK_CHANNEL }}
8 changes: 7 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ on: [pull_request]
jobs:
tests:
runs-on: ubuntu-latest

permissions:
contents: write
checks: write
pull-requests: write
actions: read
statuses: write

steps:
- name: Checkout Code
id: checkout
Expand Down
Loading

0 comments on commit 48fdb42

Please sign in to comment.