Skip to content

Commit f24acb4

Browse files
Merge pull request #21 from missionlane/fix/public-only-build
fix: public only build
2 parents ac34c1f + fbe22a7 commit f24acb4

File tree

1 file changed

+4
-48
lines changed

1 file changed

+4
-48
lines changed

.github/workflows/main.yaml

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Prepare
2626
id: prep
2727
run: |
28-
ML_PROJECT_VERSION=$(TZ=UTC git --no-pager log -n1 --date="format-local:%Y%m%dT%H%M%S" --pretty="format:%cd-%h" --abbrev=7)
28+
PROJECT_VERSION=$(TZ=UTC git --no-pager log -n1 --date="format-local:%Y%m%dT%H%M%S" --pretty="format:%cd-%h" --abbrev=7)
2929
3030
VERSION=edge
3131
if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -35,40 +35,14 @@ jobs:
3535
elif [[ $GITHUB_REF == refs/pull/* ]]; then
3636
VERSION=pr-${{ github.event.number }}
3737
fi
38-
39-
# Tag with both registries GHCR and
40-
if [ '${{ github.event_name != 'pull_request' }}' == 'true' ]; then
41-
# release to all registries
42-
GHCR=ghcr.io/${GITHUB_REPOSITORY,,}
43-
ARTIFACTORY=docker.pennywise.cc/${GITHUB_REPOSITORY,,}
44-
TAGS="${ARTIFACTORY}:${VERSION},${GHCR}:${VERSION},${ARTIFACTORY}:$ML_PROJECT_VERSION,${GHCR}:$ML_PROJECT_VERSION"
45-
else
46-
# only internal staging
47-
ARTIFACTORY="docker-builds.pennywise.cc/${GITHUB_REPOSITORY,,}"
48-
TAGS="$ARTIFACTORY:$ML_PROJECT_VERSION"
49-
fi
38+
IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}
39+
TAGS="$IMAGE:$VERSION,$IMAGE:$PROJECT_VERSION"
5040
5141
# outputs
5242
for out in "build-date=$(date +%Y%m%d-%H:%M:%S)" "build-user=$(whoami)" "git-branch=$(git rev-parse --abbrev-ref HEAD)" "git-version=$(git rev-parse HEAD)" "version=${VERSION}" "tags=${TAGS}" "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"; do
5343
# echo "k=v" >> $GITHUB_OUTPUT
5444
echo $out | tee >(cat) >> $GITHUB_OUTPUT
5545
done
56-
- name: Set up QEMU
57-
uses: docker/setup-qemu-action@v2
58-
59-
- name: Set up Docker Context for Buildx
60-
id: buildx-context
61-
run: |
62-
docker context create builders
63-
64-
- name: Set up Docker Buildx
65-
uses: docker/setup-buildx-action@v2
66-
with:
67-
driver: docker-container
68-
driver-opts: network=host
69-
version: latest
70-
endpoint: builders
71-
buildkitd-flags: --debug --allow-insecure-entitlement network.host
7246
7347
- name: Login to GitHub Container Registry
7448
uses: docker/login-action@v2
@@ -77,33 +51,15 @@ jobs:
7751
username: ${{ github.repository_owner }}
7852
password: ${{ secrets.GITHUB_TOKEN }}
7953

80-
- name: Login to docker.pennywise.cc
81-
uses: docker/login-action@v2
82-
with:
83-
registry: docker.pennywise.cc
84-
username: ${{ secrets.ARTIFACTORY_USERNAME }}
85-
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
86-
87-
- name: Login to docker-builds.pennywise.cc
88-
uses: docker/login-action@v2
89-
with:
90-
registry: docker-builds.pennywise.cc
91-
username: ${{ secrets.ARTIFACTORY_USERNAME }}
92-
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
93-
9454
- name: Build and Push
9555
uses: docker/build-push-action@v2
9656
with:
9757
allow: network.host
98-
push: true
58+
push: ${{ github.event_name != 'pull_request' }}
9959
tags: ${{ steps.prep.outputs.tags }}
10060
file: Dockerfile
10161
context: .
102-
cache-from: type=gha
103-
cache-to: type=gha
10462
build-args: |
105-
ARTIFACTORY_PASSWORD=${{ secrets.ARTIFACTORY_PASSWORD }}
106-
ARTIFACTORY_USERNAME=${{ secrets.ARTIFACTORY_USERNAME }}
10763
BUILD_DATE=${{ steps.prep.outputs.build-date }}
10864
BUILD_USER=${{ steps.prep.outputs.build-user }}
10965
GIT_BRANCH=${{ steps.prep.outputs.git-branch }}

0 commit comments

Comments
 (0)