Skip to content

Commit

Permalink
Merge pull request #122 from neojunjie/refactor_ingestion
Browse files Browse the repository at this point in the history
feat(datahub-ingestion): refactor datahub ingestion slim images (datahub-project#8515)
  • Loading branch information
neojunjie authored Oct 2, 2023
2 parents 65ed7ad + dba564b commit 738c271
Show file tree
Hide file tree
Showing 34 changed files with 637 additions and 406 deletions.
5 changes: 5 additions & 0 deletions .github/actions/docker-custom-build-and-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ inputs:
# e.g. latest,head,sha12345
description: "List of tags to use for the Docker image"
required: true
target:
description: "Sets the target stage to build"
required: false
outputs:
image_tag:
description: "Docker image tags"
Expand Down Expand Up @@ -62,6 +65,7 @@ runs:
platforms: linux/amd64
build-args: ${{ inputs.build-args }}
tags: ${{ steps.docker_meta.outputs.tags }}
target: ${{ inputs.target }}
load: true
push: false
- name: Upload image locally for testing (if not publishing)
Expand Down Expand Up @@ -92,6 +96,7 @@ runs:
platforms: ${{ inputs.platforms }}
build-args: ${{ inputs.build-args }}
tags: ${{ steps.docker_meta.outputs.tags }}
target: ${{ inputs.target }}
push: true

# TODO add code for vuln scanning?
45 changes: 0 additions & 45 deletions .github/workflows/docker-ingestion-base.yml
Original file line number Diff line number Diff line change
@@ -1,45 +0,0 @@
name: ingestion base
on:
release:
types: [published]
push:
branches:
- master
paths:
- ".github/workflows/docker-ingestion-base.yml"
- "docker/datahub-ingestion-base/**"
- "gradle*"
pull_request:
branches:
- master
paths:
- ".github/workflows/docker-ingestion-base.yml"
- "docker/datahub-ingestion-base/**"
- "gradle*"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-base:
name: Build and Push Docker Image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build and Push image
uses: ./.github/actions/docker-custom-build-and-push
with:
images: |
heruko/datahub-ingestion-base
tags: latest
username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
publish: ${{ github.ref == 'refs/heads/master' }}
context: .
file: ./docker/datahub-ingestion-base/Dockerfile
platforms: linux/amd64,linux/arm64/v8
118 changes: 0 additions & 118 deletions .github/workflows/docker-ingestion.yml

This file was deleted.

Loading

0 comments on commit 738c271

Please sign in to comment.