Skip to content

Commit e95c0df

Browse files
committed
Set buildkit env vars
1 parent 9ef9010 commit e95c0df

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.github/workflows/main.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,25 +110,25 @@ jobs:
110110
echo "FLOATING_TAG=${tag}" >> $GITHUB_ENV
111111
# Handle GitHub registry used for everything other than pull requests off forked repos.
112112
- name: Login to GitHub Docker Registry ${{env.GITHUB_REGISTRY}}
113-
if: ${{ (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository) }}
113+
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
114114
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
115115
with:
116116
registry: ${{ env.GITHUB_REGISTRY }}
117117
username: ${{ github.actor }}
118118
password: ${{ secrets.GITHUB_TOKEN }}
119119
- name: Set Docker Tag
120120
id: set-docker-tag-github
121-
if: ${{ (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository) }}
121+
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
122122
run: |
123123
echo "DOCKER_TAG=${GITHUB_REGISTRY}/${{ github.repository }}/${DOCKER_SERVICE}:${FULL_GIT_SHA::7}" >> $GITHUB_ENV
124124
echo "DOCKER_FLOATING_TAG=${GITHUB_REGISTRY}/${{ github.repository }}/${DOCKER_SERVICE}:${FLOATING_TAG}" >> $GITHUB_ENV
125125
shell: bash
126126
# Handle Google Artifact Registry used for pull requests off forked repos.
127127
- name: Set up Cloud SDK
128-
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.fork) }}
128+
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name != github.repository) }}
129129
uses: isarkis/setup-gcloud@40dce7857b354839efac498d3632050f568090b6 # v1.1.1
130130
- name: Login to GAR and set tag
131-
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.fork) }}
131+
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name != github.repository) }}
132132
run: |
133133
# Need to login to GAR to be able to push images created by fork based PR workflows.
134134
PROJECT_NAME=$(gcloud config get-value project)

docker-compose.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ services:
55
context: chrobalt/docker/linux
66
cache_from:
77
- ghcr.io/youtube/chrobalt_sandbox/linux:latest
8-
- type=gha
9-
cache_to:
10-
- type=gha
118
image: ghcr.io/youtube/chrobalt_sandbox/linux:latest
129
platform: linux/amd64
1310
environment:

0 commit comments

Comments
 (0)