Skip to content

Commit e420044

Browse files
committed
Revert "TEST: base push to local registry"
This reverts commit 22a7e2c.
1 parent 22a7e2c commit e420044

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
base-deploy:
3131
name: Base Deploy - ${{ matrix.idris-version }}
3232
# only deploy if it's a push to main
33-
# if: github.event_name == 'schedule' || github.event_name == 'push'
33+
if: github.event_name == 'schedule' || github.event_name == 'push'
3434
needs: [base-build-test]
3535
strategy:
3636
matrix:

.github/workflows/version-base-deploy.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ jobs:
1515
deploy-base:
1616
name: Deploy Base - ${{ inputs.idris-version }}
1717
runs-on: ubuntu-latest
18-
services:
19-
registry:
20-
image: registry:2
21-
ports:
22-
- 5000:5000
23-
env:
24-
TAG: localhost:5000/base-${{ inputs.idris-version }}:latest
2518
steps:
2619
- name: Checkout Repo
2720
uses: actions/checkout@v4
@@ -36,17 +29,15 @@ jobs:
3629
- name: Set up Docker Buildx
3730
uses: docker/setup-buildx-action@v3
3831
with:
39-
# since we're using a local registry
40-
driver-opts: network=host
4132
append: |
4233
- endpoint: ssh://${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}
4334
44-
# - name: Login to GHCR
45-
# uses: docker/login-action@v3
46-
# with:
47-
# registry: ghcr.io
48-
# username: ${{ github.actor }}
49-
# password: ${{ secrets.GITHUB_TOKEN }}
35+
- name: Login to GHCR
36+
uses: docker/login-action@v3
37+
with:
38+
registry: ghcr.io
39+
username: ${{ github.actor }}
40+
password: ${{ secrets.GITHUB_TOKEN }}
5041

5142
- name: Docker meta
5243
id: create-meta
@@ -59,12 +50,9 @@ jobs:
5950
with:
6051
idris-version: ${{ inputs.idris-version }}
6152
push: true
62-
tags: ${{ env.TAG }}
53+
tags: ghcr.io/${{ github.repository }}/base:${{ inputs.idris-version }}
6354
labels: ${{ steps.create-meta.outputs.labels }}
6455
platforms: linux/amd64,linux/arm64
65-
66-
- name: Run docker image ls
67-
run: docker image ls
6856

6957
deploy-consumers:
7058
name: Deploy Consumer - ${{ matrix.dockerfile }} ${{ inputs.idris-version }}
@@ -108,4 +96,4 @@ jobs:
10896
IDRIS_VERSION=${{ inputs.idris-version }}
10997
BASE_IMG=ghcr.io/${{ github.repository }}/base:${{ inputs.idris-version }}
11098
tags: ghcr.io/${{ github.repository }}/${{ matrix.dockerfile }}:${{ inputs.idris-version }}
111-
push: false
99+
push: true

0 commit comments

Comments
 (0)