Skip to content

Commit ebbe15a

Browse files
committed
I think i fixed the deploy scripts? [skip ci]
Ready to merge anyway. whatever.
1 parent bf24b59 commit ebbe15a

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@ jobs:
6060
strategy:
6161
matrix:
6262
dockerfile: [ubuntu, debian]
63-
services:
64-
registry:
65-
image: registry:2
66-
ports:
67-
- 5000:5000
68-
env:
69-
# use local registry so we can reference the base image in another dockerfile
70-
# https://github.com/docker/build-push-action/issues/738
71-
BASE_TAG: localhost:5000/base-${{ inputs.idris-version }}:latest
7263
steps:
7364
- name: Checkout Repo
7465
uses: actions/checkout@v3
@@ -87,13 +78,6 @@ jobs:
8778
registry: ghcr.io
8879
username: ${{ github.actor }}
8980
password: ${{ secrets.GITHUB_TOKEN }}
90-
91-
- name: Build Base Image
92-
uses: ./.github/actions/build-base-img
93-
with:
94-
idris-version: ${{ inputs.idris-version }}
95-
push: true
96-
tags: ${{ env.BASE_TAG }}
9781

9882
- name: Docker meta
9983
id: create-meta
@@ -109,6 +93,6 @@ jobs:
10993
file: ${{ matrix.dockerfile }}.Dockerfile
11094
build-args: |
11195
IDRIS_VERSION=${{ inputs.idris-version }}
112-
BASE_IMG=${{ env.BASE_TAG }}
96+
BASE_IMG=ghcr.io/${{ github.repository }}/base:${{ inputs.idris-version }}
11397
tags: ghcr.io/${{ github.repository }}/${{ matrix.dockerfile }}:${{ inputs.idris-version }}
11498
push: true

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ jobs:
5151
uses: docker/metadata-action@v4
5252
with:
5353
images: ${{ github.repository }}/devcontainer
54-
54+
5555
- name: Build Devcontainer
5656
uses: ./.github/actions/build-devcontainer-img
5757
with:
5858
idris-lsp-version: ${{ inputs.idris-lsp-version }}
5959
idris-version: ${{ inputs.idris-version }}
6060
push: true
6161
tags: ghcr.io/${{ github.repository }}/base:${{ inputs.idris-lsp-version }}
62+
labels: ${{ steps.create-meta.outputs.labels }}
6263
base-tag: ghcr.io/joshuanianji/idris-2-docker/base:${{ inputs.idris-version }}
64+
platforms: linux/arm64,linux/amd64
6365

0 commit comments

Comments
 (0)