Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit e1a887f

Browse files
switched to github package registry (#104)
* switched to github package registry * switched to GHCR for the nifi image as well Co-authored-by: Paul Latzelsperger <[email protected]>
1 parent 042339a commit e1a887f

File tree

2 files changed

+15
-32
lines changed

2 files changed

+15
-32
lines changed

.github/workflows/build-docker.yaml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,41 +53,22 @@ jobs:
5353
- name: Set up Docker Buildx
5454
uses: docker/setup-buildx-action@v1
5555

56-
- name: Login to DockerHub
56+
- name: Login to Github Container Registry
5757
uses: docker/login-action@v1
5858
with:
59-
username: ${{ secrets.DOCKERHUB_USERNAME }}
60-
password: ${{ secrets.DOCKERHUB_TOKEN }}
59+
registry: ghcr.io
60+
username: ${{ github.repository_owner }}
61+
password: ${{ secrets.GITHUB_TOKEN }}
6162

6263
- name: Build and push
6364
uses: docker/build-push-action@v2
6465
with:
6566
context: external/nifi
67+
pull: true
6668
push: true
67-
platforms: linux/amd64,linux/arm64
69+
# cache-from: type=registry,ref=microsoft/data-appliance-gx/nifi:latest
6870
cache-to: type=inline
69-
tags: beardyinc/nifi:latest
70-
71-
72-
# we can enable the v2 of the docker build once the improved container support has been enabled for the repo:
73-
# https://bit.ly/3hB5sJ6
74-
75-
# - name: Login to Github Container Registry
76-
# uses: docker/login-action@v1
77-
# with:
78-
# registry: ghcr.io
79-
# username: ${{ github.repository_owner }}
80-
# password: ${{ secrets.GITHUB_TOKEN }}
81-
#
82-
# - name: Build and push
83-
# uses: docker/build-push-action@v2
84-
# with:
85-
# context: external/nifi
86-
# pull: true
87-
# push: true
88-
# # cache-from: type=registry,ref=microsoft/data-appliance-gx/nifi:latest
89-
# cache-to: type=inline
90-
# tags: ghcr.io/microsoft/data-appliance-gx/nifi:latest
71+
tags: ghcr.io/microsoft/data-appliance-gx/nifi:latest
9172

9273
build-connector-image:
9374
runs-on: ubuntu-latest
@@ -107,11 +88,12 @@ jobs:
10788
- name: Set up Docker Buildx
10889
uses: docker/setup-buildx-action@v1
10990

110-
- name: Login to DockerHub
91+
- name: Login to Github Container Registry
11192
uses: docker/login-action@v1
11293
with:
113-
username: ${{ secrets.DOCKERHUB_USERNAME }}
114-
password: ${{ secrets.DOCKERHUB_TOKEN }}
94+
registry: ghcr.io
95+
username: ${{ github.repository_owner }}
96+
password: ${{ secrets.GITHUB_TOKEN }}
11597

11698
- name: Build and push
11799
uses: docker/build-push-action@v2
@@ -121,4 +103,5 @@ jobs:
121103
push: true
122104
platforms: linux/amd64,linux/arm64
123105
cache-to: type=inline
124-
tags: beardyinc/dagx-demo:latest
106+
# tags: beardyinc/dagx-demo:latest
107+
tags: ghcr.io/microsoft/data-appliance-gx/dagx-demo:latest

scripts/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ resource "azurerm_container_group" "connector-instance" {
235235
dns_name_label = "${var.resourcesuffix}-dagx"
236236
container {
237237
cpu = 2
238-
image = "beardyinc/dagx-demo:${var.SHORT_SHA}"
238+
image = "ghcr.io/microsoft/data-appliance-gx/dagx-demo:${var.SHORT_SHA}"
239239
memory = "2"
240240
name = "dagx-demo"
241241

@@ -272,7 +272,7 @@ resource "azurerm_container_group" "dagx-nifi" {
272272
dns_name_label = "${var.resourcesuffix}-dagx-nifi"
273273
container {
274274
cpu = 4
275-
image = "beardyinc/nifi:dagx"
275+
image = "ghcr.io/microsoft/data-appliance-gx/nifi:latest"
276276
memory = 4
277277
name = "nifi"
278278

0 commit comments

Comments
 (0)