Skip to content

Ecr fixes + opentofu #224

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

Merged
0ssigeno merged 5 commits into from
Feb 11, 2026
Merged

Ecr fixes + opentofu #224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da085b6
Ecr fixes
0ssigeno Aug 21, 2025
499d151
Opentofu stuff
0ssigeno Aug 27, 2025
5023a80
Added pre commit
0ssigeno Aug 27, 2025
79efd16
Update
0ssigeno Feb 11, 2026
e318718
Merge branch 'develop' into ecr_fixes
0ssigeno Feb 11, 2026
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
7 changes: 6 additions & 1 deletion .github/actions/push_on_ecr/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ inputs:
image_tag:
description: Directory that must be run against the linters
required: true
image_target:
description: Image target stage
required: true
default: BASE

aws_region:
description: Aws region
Expand All @@ -46,11 +50,12 @@ runs:
uses: docker/setup-buildx-action@v3

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ${{ inputs.working_directory }}
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{inputs.aws_account_id}}.dkr.ecr.${{inputs.aws_region}}.amazonaws.com/${{ inputs.repository }}:${{ inputs.image_tag }}
file: ${{ inputs.working_directory }}/${{ inputs.dockerfile }}
target: ${{ inputs.image_target }}
59 changes: 42 additions & 17 deletions .github/workflows/_release_and_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,12 @@ on:
type: boolean
required: false
default: false
repository:
description: Repository name
type: string
required: false
default: ${{ github.event.repository.name }}

dockerfiles:
description: Path for dockerfiles from working directory
docker_mapping:
description: List[Dict[dockerfile sep "dockerfile_path", repository sep "repository_name"]]
Comment thread
0ssigeno marked this conversation as resolved.
type: string
required: false

working_directory:
description: Docker build context
type: string
Expand Down Expand Up @@ -148,39 +144,68 @@ jobs:
access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}


push_on_ecr:
push_on_ecr_branch:
runs-on: ubuntu-latest
needs: release_and_tag
if: github.event.pull_request.merged == true && inputs.publish_on_ecr == true
Comment thread
0ssigeno marked this conversation as resolved.
environment: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || ( github.base_ref == 'develop' || github.base_ref == 'dev' ) && 'stag' || 'test' }}
if: inputs.publish_on_ecr == true
strategy:
matrix:
dockerfile: ${{ fromJson(inputs.dockerfiles) }}
docker_mapping: ${{ fromJson(inputs.docker_mapping) }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # otherwise, you do not retrieve the tags
- name: Push on ecr branch

- name: Push on ecr branch from merge
uses: ./.github/actions/push_on_ecr
if: github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'develop' || github.base_ref == 'dev'
if: github.event.pull_request.merged == true && (github.base_ref == 'master' || github.base_ref == 'develop')
with:
repository: ${{ inputs.repository }}
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ matrix.dockerfile }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || 'stag' }}
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
image_target: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || 'stag' }}

- name: Push on ecr branch from push
uses: ./.github/actions/push_on_ecr
if: github.ref_name == 'test' || github.ref_name == 'opentofu'
with:
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: 'test'
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
image_target: 'test'

push_on_ecr_tag:
runs-on: ubuntu-latest
needs: release_and_tag
environment: "prod"
if: github.event.pull_request.merged == true && inputs.publish_on_ecr == true
strategy:
matrix:
docker_mapping: ${{ fromJson(inputs.docker_mapping) }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # otherwise, you do not retrieve the tags

- name: Push on ecr new release
if: needs.release_and_tag.outputs.match == 'true' && (github.base_ref == 'master' || github.base_ref == 'main' )
uses: ./.github/actions/push_on_ecr
with:
repository: ${{ inputs.repository }}
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ inputs.dockerfile }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: ${{ github.event.pull_request.title }}
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
12 changes: 10 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ on:
pull_request:
types:
- closed
branches:
- 'master'
- 'main'
- 'develop'
- 'test'
push:
branches:
- 'test'
- 'opentofu'

# discard previous execution if you commit to a branch that is already running
concurrency:
Expand All @@ -23,6 +32,5 @@ jobs:
publish_on_ecr: false
repository: certego-test
working_directory: .github/test/python_test
dockerfiles: >-
["Dockerfile"]
docker_mapping: '[{ dockerfile: "docker/Dockerfile", repository: "test"}]'
aws_region: eu-central-1
7 changes: 6 additions & 1 deletion actions/push_on_ecr/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ inputs:
image_tag:
description: Directory that must be run against the linters
required: true
image_target:
description: Image target stage
required: true
default: BASE

aws_region:
description: Aws region
Expand All @@ -46,11 +50,12 @@ runs:
uses: docker/setup-buildx-action@v3

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ${{ inputs.working_directory }}
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{inputs.aws_account_id}}.dkr.ecr.${{inputs.aws_region}}.amazonaws.com/${{ inputs.repository }}:${{ inputs.image_tag }}
file: ${{ inputs.working_directory }}/${{ inputs.dockerfile }}
target: ${{ inputs.image_target }}
59 changes: 42 additions & 17 deletions workflows/_release_and_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,12 @@ on:
type: boolean
required: false
default: false
repository:
description: Repository name
type: string
required: false
default: ${{ github.event.repository.name }}

dockerfiles:
description: Path for dockerfiles from working directory
docker_mapping:
description: List[Dict[dockerfile sep "dockerfile_path", repository sep "repository_name"]]
type: string
required: false

working_directory:
description: Docker build context
type: string
Expand Down Expand Up @@ -148,39 +144,68 @@ jobs:
access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}


push_on_ecr:
push_on_ecr_branch:
runs-on: ubuntu-latest
needs: release_and_tag
if: github.event.pull_request.merged == true && inputs.publish_on_ecr == true
environment: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || ( github.base_ref == 'develop' || github.base_ref == 'dev' ) && 'stag' || 'test' }}
if: inputs.publish_on_ecr == true
strategy:
matrix:
dockerfile: ${{ fromJson(inputs.dockerfiles) }}
docker_mapping: ${{ fromJson(inputs.docker_mapping) }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # otherwise, you do not retrieve the tags
- name: Push on ecr branch

- name: Push on ecr branch from merge
uses: ./.github/actions/push_on_ecr
if: github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'develop' || github.base_ref == 'dev'
if: github.event.pull_request.merged == true && (github.base_ref == 'master' || github.base_ref == 'develop')
with:
repository: ${{ inputs.repository }}
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ matrix.dockerfile }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || 'stag' }}
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
image_target: ${{ ( github.base_ref == 'main' || github.base_ref == 'master' ) && 'prod' || 'stag' }}

- name: Push on ecr branch from push
uses: ./.github/actions/push_on_ecr
if: github.ref_name == 'test' || github.ref_name == 'opentofu'
with:
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: 'test'
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
image_target: 'test'

push_on_ecr_tag:
runs-on: ubuntu-latest
needs: release_and_tag
environment: "prod"
if: github.event.pull_request.merged == true && inputs.publish_on_ecr == true
strategy:
matrix:
docker_mapping: ${{ fromJson(inputs.docker_mapping) }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # otherwise, you do not retrieve the tags

- name: Push on ecr new release
if: needs.release_and_tag.outputs.match == 'true' && (github.base_ref == 'master' || github.base_ref == 'main' )
uses: ./.github/actions/push_on_ecr
with:
repository: ${{ inputs.repository }}
repository: ${{ matrix.docker_mapping.repository }}
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
aws_access_key: ${{ secrets.AWS_ACCESS_KEY}}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
dockerfile: ${{ inputs.dockerfile }}
dockerfile: ${{ matrix.docker_mapping.dockerfile }}
image_tag: ${{ github.event.pull_request.title }}
aws_region: ${{ inputs.aws_region }}
working_directory: ${{ inputs.working_directory }}
12 changes: 10 additions & 2 deletions workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ on:
pull_request:
types:
- closed
branches:
- 'master'
- 'main'
- 'develop'
- 'test'
push:
branches:
- 'test'
- 'opentofu'

# discard previous execution if you commit to a branch that is already running
concurrency:
Expand All @@ -23,6 +32,5 @@ jobs:
publish_on_ecr: false
repository: certego-test
working_directory: .github/test/python_test
dockerfiles: >-
["Dockerfile"]
docker_mapping: '[{ dockerfile: "docker/Dockerfile", repository: "test"}]'
aws_region: eu-central-1
Loading